Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"

4 files changed, 80 insertions, 0 deletions

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
+)