From 9a4391271b527e4489df2ffc44a503797e25b51b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 25 Jun 2020 21:20:49 +0200 Subject: [PATCH] Remove superfluous define from tst_qmake The QMAKE_CROSS_COMPILED define isn't used since 2011. Change-Id: I9f03791e9f7c0ef439db5e65d930c0b7cb928974 Reviewed-by: Alexandru Croitor --- tests/auto/tools/qmake/.prev_CMakeLists.txt | 15 --------------- tests/auto/tools/qmake/CMakeLists.txt | 5 ----- tests/auto/tools/qmake/qmake.pro | 3 --- 3 files changed, 23 deletions(-) diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt index c1367ec18fd..48b88a2285e 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 62db9257b80..48b88a2285e 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 0e8ebcc7cce..adb73b5e55f 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/*