diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 13:09:55 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 16:53:19 +0200 |
commit | c7ec7cd2a1ae9bec31113fae1f1e549b2bf98e0b (patch) | |
tree | fc81fba4e7815ea061da277cf3bcf3102866932f /tests/auto/corelib/kernel/qvariant/CMakeLists.txt | |
parent | 7947032e2d1d68b2c0f79874db7adcf560851f29 (diff) | |
parent | 6132260da394a9627947f0fe6a279c20863b6ad2 (diff) |
Merge branch 'wip/qt6' into wip/cmake
Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant/CMakeLists.txt')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index b611bece63..dbf9e0b119 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -9,6 +9,7 @@ add_qt_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES + # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common @@ -17,23 +18,18 @@ add_qt_test(tst_qvariant ) # Resources: +set(qvariant_resource_files + "stream/qt4.9/" + "stream/qt5.0/" +) + add_qt_resource(tst_qvariant "qvariant" PREFIX "/" FILES - stream/qt4.9/ - stream/qt5.0/ + ${qvariant_resource_files} ) -#### Keys ignored in scope 1:.:.:qvariant.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qvariant.pro:qtConfig(c++14): -# CONFIG = "c++14" - -#### Keys ignored in scope 3:.:.:qvariant.pro:qtConfig(c++1z): -# CONFIG = "c++1z" |