Regenerate tests/auto/tools
Change-Id: I25268499ff966ebf134150accbaec7634726fe40 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
This commit is contained in:
parent
209c7238a7
commit
f7d7021460
@ -5,7 +5,6 @@
|
||||
#####################################################################
|
||||
|
||||
add_qt_test(tst_qdbuscpp2xml
|
||||
GUI
|
||||
SOURCES
|
||||
test1.h
|
||||
tst_qdbuscpp2xml.cpp
|
||||
|
@ -1 +1,10 @@
|
||||
add_qt_test(tst_qdbusxml2cpp SOURCES tst_qdbusxml2cpp.cpp)
|
||||
# Generated from qdbusxml2cpp.pro.
|
||||
|
||||
#####################################################################
|
||||
## tst_qdbusxml2cpp Test:
|
||||
#####################################################################
|
||||
|
||||
add_qt_test(tst_qdbusxml2cpp
|
||||
SOURCES
|
||||
tst_qdbusxml2cpp.cpp
|
||||
)
|
||||
|
39
tests/auto/tools/qmake/.prev_CMakeLists.txt
Normal file
39
tests/auto/tools/qmake/.prev_CMakeLists.txt
Normal file
@ -0,0 +1,39 @@
|
||||
# Generated from qmake.pro.
|
||||
|
||||
#####################################################################
|
||||
## tst_qmake Test:
|
||||
#####################################################################
|
||||
|
||||
# Collect test data
|
||||
file(GLOB_RECURSE test_data_glob
|
||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
testdata/*)
|
||||
list(APPEND test_data ${test_data_glob})
|
||||
|
||||
add_qt_test(tst_qmake
|
||||
SOURCES
|
||||
testcompiler.cpp testcompiler.h
|
||||
tst_qmake.cpp
|
||||
TESTDATA ${test_data}
|
||||
)
|
||||
|
||||
## Scopes:
|
||||
#####################################################################
|
||||
|
||||
#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
|
||||
# testcase.timeout = "900"
|
||||
|
||||
extend_target(tst_qmake CONDITION cross_compile
|
||||
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,14 +5,12 @@
|
||||
#####################################################################
|
||||
|
||||
# Collect test data
|
||||
|
||||
file(GLOB_RECURSE test_data_glob
|
||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
"testdata/*")
|
||||
testdata/*)
|
||||
list(APPEND test_data ${test_data_glob})
|
||||
|
||||
add_qt_test(tst_qmake
|
||||
GUI
|
||||
SOURCES
|
||||
testcompiler.cpp testcompiler.h
|
||||
tst_qmake.cpp
|
||||
@ -25,7 +23,20 @@ add_qt_test(tst_qmake
|
||||
#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
|
||||
# testcase.timeout = "900"
|
||||
|
||||
extend_target(tst_qmake CONDITION (CMAKE_CROSSCOMPILING) # special case
|
||||
extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING # special case
|
||||
DEFINES
|
||||
QMAKE_CROSS_COMPILED
|
||||
)
|
||||
|
||||
# special case begin
|
||||
# remove this because it's not needed
|
||||
#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
|
||||
#)
|
||||
# special case end
|
||||
|
@ -5,7 +5,6 @@
|
||||
#####################################################################
|
||||
|
||||
add_qt_test(tst_qmakelib
|
||||
GUI
|
||||
SOURCES
|
||||
../../../../qmake/library/ioutils.cpp
|
||||
../../../../qmake/library/proitems.cpp
|
||||
|
@ -1 +1,10 @@
|
||||
add_qt_test(tst_uic SOURCES tst_uic.cpp)
|
||||
# Generated from uic.pro.
|
||||
|
||||
#####################################################################
|
||||
## tst_uic Test:
|
||||
#####################################################################
|
||||
|
||||
add_qt_test(tst_uic
|
||||
SOURCES
|
||||
tst_uic.cpp
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user