diff --git a/scripts/static-clang-analyzer.sh b/scripts/static-clang-analyzer.sh index f6ecba8..2c55064 100755 --- a/scripts/static-clang-analyzer.sh +++ b/scripts/static-clang-analyzer.sh @@ -11,7 +11,7 @@ rm -rf build; mkdir build; cd build export CC=/usr/bin/clang export CXX=/usr/bin/clang++ -cmake -DBUILD_TESTING=OFF -DENABLE_QASSERT=ON -DCMAKE_PREFIX_PATH="$EXT_BASE/pjproject;$EXT_BASE/qca/lib/cmake" .. +cmake -DBUILD_TESTING=OFF -DBUILD_DEPENDENCIES=ON -DENABLE_QASSERT=ON -DCMAKE_PREFIX_PATH="$EXT_BASE/pjproject;$EXT_BASE/qca/lib/cmake" .. set -eo pipefail intercept-build make -j$(nproc --all) 2>&1 | tee /tmp/build.log diff --git a/scripts/static-clazy-analyzer.sh b/scripts/static-clazy-analyzer.sh index 5c0ad23..966d5ea 100755 --- a/scripts/static-clazy-analyzer.sh +++ b/scripts/static-clazy-analyzer.sh @@ -12,7 +12,7 @@ export CLAZY_IGNORE_DIRS="(.*qmltyperegistrations.*|.*/tests/.*|.*/\\.rcc/.*|.*/ export CLAZY_CHECKS="level0,level1,qt6-header-fixes,no-no-module-include,no-lambda-unique-connection" export CLAZY_NO_WERROR=ON -cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_CLAZY=ON -DCMAKE_PREFIX_PATH="$EXT_BASE/pjproject;$EXT_BASE/qca/lib/cmake" .. +cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPENDENCIES=ON -DENABLE_CLAZY=ON -DCMAKE_PREFIX_PATH="$EXT_BASE/pjproject;$EXT_BASE/qca/lib/cmake" .. cmake --build . --parallel $(nproc --all) 2>&1 | tee /tmp/build.log popd diff --git a/src/contacts/CardDAVAddressBookFeeder.cpp b/src/contacts/CardDAVAddressBookFeeder.cpp index 33b9019..a7375b5 100644 --- a/src/contacts/CardDAVAddressBookFeeder.cpp +++ b/src/contacts/CardDAVAddressBookFeeder.cpp @@ -58,8 +58,9 @@ void CardDAVAddressBookFeeder::processVcard(QByteArray data, const QString &uuid } const auto version = matchResult.captured("version"); if (version != "3.0") { - qCCritical(lcCardDAVAddressBookFeeder) << "Only vCard version 3.0 is supported at the moment but found" << version - << "- ignoring"; + qCCritical(lcCardDAVAddressBookFeeder) + << "Only vCard version 3.0 is supported at the moment but found" << version + << "- ignoring"; return; }