diff --git a/cmake/modules/AppTarget.cmake b/cmake/modules/AppTarget.cmake index 67a018a..e684b3a 100644 --- a/cmake/modules/AppTarget.cmake +++ b/cmake/modules/AppTarget.cmake @@ -42,7 +42,8 @@ if (ANDROID) if (ANDROID_ABI) set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "_${ANDROID_ABI}.so") endif () - set_target_properties(${META_TARGET_NAME} PROPERTIES QT_ANDROID_VERSION_NAME "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}") + set_target_properties(${META_TARGET_NAME} PROPERTIES QT_ANDROID_VERSION_NAME + "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}") else () add_executable(${META_TARGET_NAME} ${GUI_TYPE} ${ALL_FILES}) endif () @@ -69,13 +70,10 @@ set_target_properties( AUTOGEN_TARGET_DEPENDS "${AUTOGEN_DEPS}" QT_DEFAULT_PLUGINS "${META_QT_DEFAULT_PLUGINS}") if (NOT ANDROID) - set_target_properties( - ${META_TARGET_NAME} - PROPERTIES C_VISIBILITY_PRESET hidden - CXX_VISIBILITY_PRESET hidden) + set_target_properties(${META_TARGET_NAME} PROPERTIES C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET hidden) # note: Android *.so files need CXX visibility set to default (see qtbase commit - # 29b17fa335388c9b93f70c29b2398cf2fee65785). Otherwise loading the app will fail - # with the error "dlsym failed: undefined symbol: main". + # 29b17fa335388c9b93f70c29b2398cf2fee65785). Otherwise loading the app will fail with the error "dlsym failed: undefined + # symbol: main". endif () if (NOT META_CXX_STANDARD STREQUAL "any") set_target_properties(${META_TARGET_NAME} PROPERTIES CXX_STANDARD "${META_CXX_STANDARD}") diff --git a/tests/iotests.cpp b/tests/iotests.cpp index fbc90c4..e2c6f3b 100644 --- a/tests/iotests.cpp +++ b/tests/iotests.cpp @@ -566,7 +566,7 @@ void IoTests::testCopyWithNativeFileStream() // repeat with callback version auto percentage = 0.0; const auto isAborted = [] { return false; }; - const auto callback = [&percentage] (double p) { percentage = p; }; + const auto callback = [&percentage](double p) { percentage = p; }; testFile.seekg(0); outputStream.open(outputPath, ios_base::out | ios_base::trunc | ios_base::binary); copyHelper.callbackCopy(testFile, outputStream, 50, isAborted, callback);