diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:01:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 10:46:33 +0100 |
commit | 100d0d2ea35834d06c864a12d6f6829692c2d990 (patch) | |
tree | 46ff779cc1f52ec81b20ad54a5946445787eeaf5 /tests | |
parent | 52b61cd81dc5ea051e49dfe9f680b6fe4259555e (diff) | |
parent | 3c3d168487b10e7e4d7c06df5a28df9d4220b6de (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Regenerating and fixing as needed.
Fixes: QTBUG-90661
Change-Id: Ief9f044d4b9ea2ce8130b11031fb93b6e673fbdd
Diffstat (limited to 'tests')
-rw-r--r-- | tests/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/qml/CMakeLists.txt | 36 | ||||
-rw-r--r-- | tests/auto/webchannel/CMakeLists.txt | 27 |
6 files changed, 94 insertions, 0 deletions
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000..1fcf495 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from auto.pro. + +add_subdirectory(cmake) +add_subdirectory(webchannel) +if(TARGET Qt::Quick) + add_subdirectory(qml) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..716f70c --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from auto.pro. + +# special case begin +# Qt5 cmake tests +#add_subdirectory(cmake) +# special case end +add_subdirectory(webchannel) +if(TARGET Qt::Quick) + add_subdirectory(qml) +endif() diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt new file mode 100644 index 0000000..c292d77 --- /dev/null +++ b/tests/auto/qml/CMakeLists.txt @@ -0,0 +1,36 @@ +# Generated from qml.pro. + +##################################################################### +## qml Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_internal_add_test(tst_qmlwebchannel + QMLTEST + QML_IMPORTPATH + "${CMAKE_CURRENT_BINARY_DIR}/../../../qml" + "${CMAKE_CURRENT_SOURCE_DIR}" + SOURCES + qml.cpp + testobject.cpp testobject.h + testtransport.cpp testtransport.h + testwebchannel.cpp testwebchannel.h + LIBRARIES + Qt::CorePrivate + Qt::WebChannelPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::WebChannel + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: +# DISTFILES = "tst_webchannelseparation.qml" +# IMPORTPATH = "$$OUT_PWD/../../../qml" "$$PWD" +# OTHER_FILES = "Client.qml" "WebChannelTest.qml" "tst_webchannel.qml" "tst_metaobjectpublisher.qml" "tst_bench.qml" "tst_multiclient.qml" +# TEMPLATE = "app" diff --git a/tests/auto/webchannel/CMakeLists.txt b/tests/auto/webchannel/CMakeLists.txt new file mode 100644 index 0000000..1f7d734 --- /dev/null +++ b/tests/auto/webchannel/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from webchannel.pro. + +##################################################################### +## tst_webchannel Test: +##################################################################### + +qt_add_test(tst_webchannel + SOURCES + tst_webchannel.cpp tst_webchannel.h + INCLUDE_DIRECTORIES + ../../../src/webchannel + LIBRARIES + Qt::CorePrivate + Qt::WebChannelPrivate + PUBLIC_LIBRARIES + Qt::WebChannel +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_webchannel CONDITION TARGET Qt::Qml + DEFINES + WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE + PUBLIC_LIBRARIES + Qt::Qml +) |