Remove autogenerated .qrc file in compositor import

This code would unconditionally generate a qrc file for
two .qml files instead of just adding the qrc file to the
repository for some reason. This caused problems in the conversion
to cmake.

Change-Id: Ib859e51155847f72d646ce174259d3b8ba5ca93d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

4 files changed, 28 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index b337d343b..a1cf2f9a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ src/compositor/QtWaylandCompositor.version
 src/compositor/QtWaylandCompositor.version.in
 src/plugins/platforms/wayland_common/libwayland_common.a
 src/plugins/platforms/wayland_common/libwayland_common.prl
-src/imports/compositor/compositor.qrc
 tests/auto/client/*/tst_*
 !tests/auto/client/*/tst_*.cpp
 tests/auto/compositor/compositor/tst_compositor
diff --git a/src/imports/compositor/CMakeLists.txt b/src/imports/compositor/CMakeLists.txt
index 1f51d6362..79aa5dbb6 100644
--- a/src/imports/compositor/CMakeLists.txt
+++ b/src/imports/compositor/CMakeLists.txt
@@ -22,17 +22,29 @@ qt_add_qml_module(qwaylandcompositorplugin
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
 )
-#### Ignored generated resource: ${CMAKE_CURRENT_BINARY_DIR}/compositor.qrc
+
+# Resources:
+set(compositor_resource_files
+    "WaylandCursorItem.qml"
+    "WaylandOutputWindow.qml"
+)
+
+qt_add_resource(qwaylandcompositorplugin "compositor"
+    PREFIX
+        "/QtWaylandCompositor"
+    FILES
+        ${compositor_resource_files}
+)
+
+
 #### Keys ignored in scope 1:.:.:compositor.pro:<TRUE>:
-# COMPOSITOR_QML_FILES = "WaylandOutputWindow.qml" "WaylandCursorItem.qml"
 # CXX_MODULE = "qml"
 # QMAKE_QMLPLUGINDUMP_FLAGS = "-defaultplatform"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
-# RESOURCE_CONTENT = "<RCC>" "<qresource prefix="/QtWayland/Compositor">" "</qresource>" "</RCC>"
 # TARGETPATH = "QtWayland/Compositor"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 3:.:.:compositor.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
-# QML_FILES = "$$COMPOSITOR_QML_FILES"
+#### Keys ignored in scope 2:.:.:compositor.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# QML_FILES = "WaylandOutputWindow.qml" "WaylandCursorItem.qml"
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro
index 4d5b82b8d..193450a84 100644
--- a/src/imports/compositor/compositor.pro
+++ b/src/imports/compositor/compositor.pro
@@ -10,34 +10,13 @@ SOURCES += \
     qwaylandquickcompositorplugin.cpp \
     qwaylandmousetracker.cpp
 
-COMPOSITOR_QML_FILES += \
-    WaylandOutputWindow.qml \
-    WaylandCursorItem.qml
-
-# Create the resource file
-GENERATED_RESOURCE_FILE = $$OUT_PWD/compositor.qrc
-
-RESOURCE_CONTENT = \
-    "<RCC>" \
-    "<qresource prefix=\"/QtWayland/Compositor\">"
-
-for(resourcefile, COMPOSITOR_QML_FILES) {
-    resourcefileabsolutepath = $$absolute_path($$resourcefile)
-    relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_)
-    relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD)
-    RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>"
-}
-
-RESOURCE_CONTENT += \
-    "</qresource>" \
-    "</RCC>"
-
-write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.")
-
-RESOURCES += $$GENERATED_RESOURCE_FILE
+RESOURCES += compositor.qrc
 
 # In case of a debug build, deploy the QML files too
-CONFIG(debug, debug|release): QML_FILES += $$COMPOSITOR_QML_FILES
+CONFIG(debug, debug|release): \
+    QML_FILES += \
+        WaylandOutputWindow.qml \
+        WaylandCursorItem.qml
 
 QT += quick-private qml-private gui-private core-private waylandcompositor waylandcompositor-private
 
diff --git a/src/imports/compositor/compositor.qrc b/src/imports/compositor/compositor.qrc
new file mode 100644
index 000000000..0004e0837
--- /dev/null
+++ b/src/imports/compositor/compositor.qrc
@@ -0,0 +1,6 @@
+<RCC>
+<qresource prefix="/QtWaylandCompositor">
+  <file>WaylandOutputWindow.qml</file>
+  <file>WaylandCursorItem.qml</file>
+</qresource>
+</RCC>