diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-28 16:42:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 10:01:25 +0200 |
| commit | 350a2f48c15d7766a58f13c9625e32e766ecdf80 (patch) | |
| tree | b6e05e3ae5d8e0db8e06d56df71e877124a00afd /tests/auto/qml/qqmlmoduleplugin | |
| parent | 965984771d1c146a01fbaab3f6dae2461eabf78e (diff) | |
CMake: Regenerate qtdeclarative/tests
Includes:
- new api calls
- some new dependencies
- some TARGET_DESCRIPTION
- some additional tool directory exclusion when cross-compiling
(qmlplugindump)
- some missing add_subdirectory calls
Change-Id: Iea43e45b94f37367ffc1d8dd6ce0ff1021a31b1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index d7665ece5e..e74104e381 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_BINARY_DIR}/imports/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qqmlmoduleplugin +qt_add_test(tst_qqmlmoduleplugin SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,7 +38,7 @@ set(qmake_waitingPlugin_resource_files "moduleWithWaitingPlugin" ) -add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" +qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -48,7 +48,7 @@ set(qmake_staticPlugin_resource_files "moduleWithStaticPlugin" ) -add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" +qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -59,12 +59,12 @@ add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" ## Scopes: ##################################################################### -extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS +qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt index 111fdafb88..d0aa1a9aa9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt @@ -18,7 +18,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_BINARY_DIR}/imports/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qqmlmoduleplugin +qt_add_test(tst_qqmlmoduleplugin SOURCES ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h ../../shared/util.cpp ../../shared/util.h @@ -38,7 +38,7 @@ set(qmake_waitingPlugin_resource_files "moduleWithWaitingPlugin" ) -add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" +qt_add_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -48,7 +48,7 @@ set(qmake_staticPlugin_resource_files "moduleWithStaticPlugin" ) -add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" +qt_add_resource(tst_qqmlmoduleplugin "qmake_staticPlugin" PREFIX "/qt-project.org/imports/" FILES @@ -77,12 +77,12 @@ add_qt_resource(tst_qqmlmoduleplugin staticPlugin ## Scopes: ##################################################################### -extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS +qt_extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |