diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-25 21:20:49 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-26 21:24:52 +0200 |
| commit | 9a4391271b527e4489df2ffc44a503797e25b51b (patch) | |
| tree | 92bf10fe16a404277b3fcac09a0a70f55791d26b /tests | |
| parent | af61b5ca5cd92dbf21ee42e0a74f618b3b578ddd (diff) | |
Remove superfluous define from tst_qmake
The QMAKE_CROSS_COMPILED define isn't used since 2011.
Change-Id: I9f03791e9f7c0ef439db5e65d930c0b7cb928974
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/qmake/.prev_CMakeLists.txt | 15 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/qmake.pro | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt index c1367ec18f..48b88a2285 100644 --- a/tests/auto/tools/qmake/.prev_CMakeLists.txt +++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt @@ -22,18 +22,3 @@ add_qt_test(tst_qmake #### Keys ignored in scope 2:.:.:qmake.pro:WIN32: # testcase.timeout = "900" - -extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING - DEFINES - QMAKE_CROSS_COMPILED -) - -extend_target(tst_qmake CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release - DEFINES - DEBUG_BUILD -) - -extend_target(tst_qmake CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug - DEFINES - RELEASE_BUILD -) diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt index 62db9257b8..48b88a2285 100644 --- a/tests/auto/tools/qmake/CMakeLists.txt +++ b/tests/auto/tools/qmake/CMakeLists.txt @@ -22,8 +22,3 @@ add_qt_test(tst_qmake #### Keys ignored in scope 2:.:.:qmake.pro:WIN32: # testcase.timeout = "900" - -extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING - DEFINES - QMAKE_CROSS_COMPILED -) diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro index 0e8ebcc7cc..adb73b5e55 100644 --- a/tests/auto/tools/qmake/qmake.pro +++ b/tests/auto/tools/qmake/qmake.pro @@ -5,7 +5,4 @@ TARGET = tst_qmake HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp QT = core testlib - -cross_compile: DEFINES += QMAKE_CROSS_COMPILED - TESTDATA += testdata/* |