Fix qqmlmoduleplugin test

Change-Id: I87354d4b8f8fc1acfe933640f5b48a4673a0dbd9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 69 insertions, 33 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
index 02db3b8bf3..746774c593 100644
--- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
@@ -5,27 +5,20 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "imports/*")
+    imports/*)
 list(APPEND test_data ${test_data_glob})
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_BINARY_DIR}/imports/*")
+    ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qqmlmoduleplugin
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -44,23 +37,28 @@ add_qt_test(tst_qqmlmoduleplugin
 )
 
 # Resources:
+set(qmake_waitingPlugin_resource_files
+    "moduleWithWaitingPlugin"
+)
+
 add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
-        moduleWithWaitingPlugin
+        ${qmake_waitingPlugin_resource_files}
+)
+set(qmake_staticPlugin_resource_files
+    "moduleWithStaticPlugin"
 )
+
 add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
-        moduleWithStaticPlugin
+        ${qmake_staticPlugin_resource_files}
 )
 
 
-#### Keys ignored in scope 2:.:.:tst_qqmlmoduleplugin.pro:<TRUE>:
-# CONFIG = "testcase" "-app_bundle"
-
 ## Scopes:
 #####################################################################
 
@@ -93,3 +91,4 @@ add_subdirectory(plugin/childplugin)
 add_subdirectory(plugin.2/childplugin)
 add_subdirectory(plugin.2.1/childplugin)
 add_subdirectory(plugin.2.2)
+add_subdirectory(moduleWithQmlSingleton)
diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
index 715e75b1f5..85538c3a89 100644
--- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
@@ -5,27 +5,20 @@
 #####################################################################
 
 # Collect test data
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "imports/*")
+    imports/*)
 list(APPEND test_data ${test_data_glob})
-
-file(GLOB test_data_glob
-    LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_BINARY_DIR}/imports/*")
+    ${CMAKE_CURRENT_BINARY_DIR}/imports/*)
 list(APPEND test_data ${test_data_glob})
 
 add_qt_test(tst_qqmlmoduleplugin
-    GUI
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
@@ -44,17 +37,25 @@ add_qt_test(tst_qqmlmoduleplugin
 )
 
 # Resources:
+set(qmake_waitingPlugin_resource_files
+    "moduleWithWaitingPlugin"
+)
+
 add_qt_resource(tst_qqmlmoduleplugin "qmake_waitingPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
-        moduleWithWaitingPlugin
+        ${qmake_waitingPlugin_resource_files}
+)
+set(qmake_staticPlugin_resource_files
+    "moduleWithStaticPlugin"
 )
+
 add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
     PREFIX
         "/qt-project.org/imports/"
     FILES
-        moduleWithStaticPlugin
+        ${qmake_staticPlugin_resource_files}
 )
 
 
@@ -108,3 +109,4 @@ add_subdirectory(plugin/childplugin)
 add_subdirectory(plugin.2/childplugin)
 add_subdirectory(plugin.2.1/childplugin)
 add_subdirectory(plugin.2.2)
+add_subdirectory(moduleWithQmlSingleton)
diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt
new file mode 100644
index 0000000000..2aab03bdfb
--- /dev/null
+++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from moduleWithQmlSingleton.pro.
+
+#####################################################################
+## moduleWithQmlSingleton Generic Library:
+#####################################################################
+
+qt_add_cmake_library(moduleWithQmlSingleton
+    MODULE
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton"
+    SOURCES
+        plugin.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Qml
+)
+
+#### Keys ignored in scope 1:.:.:moduleWithQmlSingleton.pro:<TRUE>:
+# COPIES = "importfiles" "subfiles"
+# IMPORT_FILES = "qmldir" "MySingleton.qml" "MySingleton2.qml"
+# TEMPLATE = "lib"
+# subfiles.files = "internal/InternalType.qml"
+# subfiles.path = "$$DESTDIR/internal"
+
+# special case begin
+file(COPY qmldir MySingleton.qml MySingleton2.qml
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton"
+)
+# special case end
+
+qt_autogen_tools_initial_setup(moduleWithQmlSingleton)