diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 12:01:03 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 17:25:04 +0000 |
| commit | d58d7ebfeacaab3d0840e97750c83e55f2fcf794 (patch) | |
| tree | cb9830c0f1512bf96b8a538e8b88591d2a47610e /tests/auto/corelib/kernel/qmetatype | |
| parent | 812d45ed0929565027b7dd57829775c9e086a615 (diff) | |
Regenerate tests/auto/corelib/kernel
Change-Id: I466387408d26854e11fde0a1fbef74c2fad764c7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'tests/auto/corelib/kernel/qmetatype')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt | 42 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/CMakeLists.txt | 9 |
2 files changed, 47 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt new file mode 100644 index 0000000000..1cc577fda7 --- /dev/null +++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qmetatype.pro. + +##################################################################### +## tst_qmetatype Test: +##################################################################### + +# Collect test data +list(APPEND test_data "./typeFlags.bin") + +add_qt_test(tst_qmetatype + SOURCES + tst_qmetatype.cpp + DEFINES + -QT_NO_LINKED_LIST + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../../../other/qvariant_common + LIBRARIES + Qt::CorePrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +extend_target(tst_qmetatype CONDITION MSVC OR WINRT + COMPILE_OPTIONS + /bigobj +) + +#### Keys ignored in scope 3:.:.:qmetatype.pro:WINRT: +# QMAKE_CFLAGS_RELEASE = "--O2" +# QMAKE_CXXFLAGS_RELEASE = "--O2" + +#### Keys ignored in scope 4:.:.:qmetatype.pro:CLANG: +# QMAKE_CFLAGS_RELEASE = "--O2" "--g" +# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g" + +extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") + DEFINES + TST_QMETATYPE_BROKEN_COMPILER +) diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 7a498cecfd..0a84d8bb0a 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -4,21 +4,22 @@ ## tst_qmetatype Test: ##################################################################### +# Collect test data +list(APPEND test_data "./typeFlags.bin") + add_qt_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES + # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common LIBRARIES Qt::CorePrivate + TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qmetatype.pro:<TRUE>: -# CONFIG = "testcase" -# TESTDATA = "./typeFlags.bin" - ## Scopes: ##################################################################### |