diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 14:59:40 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:52:30 +0100 |
| commit | 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (patch) | |
| tree | 836fda9d762ec9c4f8461804f1e2d22cdf16303f /tests/auto/corelib/global | |
| parent | b94b7687b0635ee74a3ccd83a234ead0600fd47f (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some wrong qmake project files
Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib/global')
| -rw-r--r-- | tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qlogging/CMakeLists.txt | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt index c95195c71e..aa5f3a533d 100644 --- a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(app) add_subdirectory(test) +add_subdirectory(test_qmessagelogger) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index 47ee7adca0..feeffd4fc5 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,29 +1,28 @@ # Generated from qlogging.pro. -# This file is almost completely custom written # special case +# This file is almost completely custom written +# special case skip regeneration qt_internal_add_executable(qlogging_helper - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + NO_INSTALL + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES app/main.cpp DEFINES QT_MESSAGELOGCONTEXT LIBRARIES Qt::Core) -# special case begin # Fixes required for the backtrace stack to be correct if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW) target_link_options(qlogging_helper PRIVATE -rdynamic) endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) -# special case end qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 - HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" # special case + HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" ) -target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # special case # to fix the binary name +target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # to fix the binary name qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp DEFINES |