1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove superfluous define from tst_qmake

Browse Source 
The QMAKE_CROSS_COMPILED define isn't used since 2011.

Change-Id: I9f03791e9f7c0ef439db5e65d930c0b7cb928974
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-06-25 21:20:49 +02:00
parent af61b5ca5c
commit 9a4391271b
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/tools/qmake/.prev_CMakeLists.txt
View File

@ -22,18 +22,3 @@ add_qt_test(tst_qmake
#### Keys ignored in scope 2:.:.:qmake.pro:WIN32: #### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
# testcase.timeout = "900" # 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
)

5
tests/auto/tools/qmake/CMakeLists.txt
View File

@ -22,8 +22,3 @@ add_qt_test(tst_qmake
#### Keys ignored in scope 2:.:.:qmake.pro:WIN32: #### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
# testcase.timeout = "900" # testcase.timeout = "900"
extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING
DEFINES
QMAKE_CROSS_COMPILED
)

3
tests/auto/tools/qmake/qmake.pro
View File

@ -5,7 +5,4 @@ TARGET = tst_qmake
HEADERS += testcompiler.h HEADERS += testcompiler.h
SOURCES += tst_qmake.cpp testcompiler.cpp SOURCES += tst_qmake.cpp testcompiler.cpp
QT = core testlib QT = core testlib
cross_compile: DEFINES += QMAKE_CROSS_COMPILED
TESTDATA += testdata/* TESTDATA += testdata/*