Fixed qml-compositor and made it properly installable without a qrc.

Change-Id: I40936865453392dc90b03f67220f70480c0eae56
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

8 files changed, 9 insertions, 19 deletions

diff --git a/examples/qml-compositor/qml/QmlCompositor/ContrastEffect.qml b/examples/qml-compositor/ContrastEffect.qml
index 332c9682d..0a9ad67b8 100644
--- a/examples/qml-compositor/qml/QmlCompositor/ContrastEffect.qml
+++ b/examples/qml-compositor/ContrastEffect.qml
@@ -48,15 +48,15 @@ ShaderEffect {
     onSourceChanged: {
         if (source != null) {
             source.setPaintEnabled(false);
-            vertexShader = source.isYInverted ? vShaderInvertedY : vShader;
+            vertexShader = source.yInverted ? vShaderInvertedY : vShader;
         }
     }
 
     Connections {
       target: source;
       onYInvertedChanged: {
-            print("onY " + source.isYInverted);
-            vertexShader = source.isYInverted ? vShaderInvertedY : vShader;
+            print("onY " + source.yInverted);
+            vertexShader = source.yInverted ? vShaderInvertedY : vShader;
         }
     }
 
diff --git a/examples/qml-compositor/qml/QmlCompositor/WindowChrome.qml b/examples/qml-compositor/WindowChrome.qml
index 6fb2ebe4d..6fb2ebe4d 100644
--- a/examples/qml-compositor/qml/QmlCompositor/WindowChrome.qml
+++ b/examples/qml-compositor/WindowChrome.qml
diff --git a/examples/qml-compositor/qml/QmlCompositor/WindowContainer.qml b/examples/qml-compositor/WindowContainer.qml
index ae70e3b87..ae70e3b87 100644
--- a/examples/qml-compositor/qml/QmlCompositor/WindowContainer.qml
+++ b/examples/qml-compositor/WindowContainer.qml
diff --git a/examples/qml-compositor/qml/QmlCompositor/compositor.js b/examples/qml-compositor/compositor.js
index ba0f74e4e..ba0f74e4e 100644
--- a/examples/qml-compositor/qml/QmlCompositor/compositor.js
+++ b/examples/qml-compositor/compositor.js
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index 93175a487..9571c802e 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -60,7 +60,7 @@ public:
         : WaylandCompositor(this)
     {
         enableSubSurfaceExtension();
-        setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
+        setSource(QUrl("main.qml"));
         setResizeMode(QQuickView::SizeRootObjectToView);
         winId();
 
diff --git a/examples/qml-compositor/qml/QmlCompositor/main.qml b/examples/qml-compositor/main.qml
index 65f610971..bd859f04d 100644
--- a/examples/qml-compositor/qml/QmlCompositor/main.qml
+++ b/examples/qml-compositor/main.qml
@@ -51,7 +51,7 @@ Item {
         id: background
         anchors.fill: parent
         fillMode: Image.Tile
-        source: "../../background.jpg"
+        source: "background.jpg"
         smooth: true
     }
 
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
index 002cce1ea..866f54c81 100644
--- a/examples/qml-compositor/qml-compositor.pro
+++ b/examples/qml-compositor/qml-compositor.pro
@@ -5,7 +5,7 @@ CONFIG += use_pkgconfig
 
 LIBS += -L ../../lib
 
-QT += quick qml     v8
+QT += quick qml v8
 QT += quick-private
 
 QT += compositor
@@ -16,9 +16,10 @@ QT += compositor
 #include (../../src/compositor/compositor.pri)
 
 SOURCES += main.cpp
-RESOURCES = qml-compositor.qrc
+
+OTHER_FILES = ContrastEffect.qml  main.qml  WindowChrome.qml  WindowContainer.qml background.jpg compositor.js
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro
+sources.files = $$OTHER_FILES $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor
 INSTALLS += target sources
diff --git a/examples/qml-compositor/qml-compositor.qrc b/examples/qml-compositor/qml-compositor.qrc
deleted file mode 100644
index 0a3898fb2..000000000
--- a/examples/qml-compositor/qml-compositor.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>background.jpg</file>
-    <file>qml/QmlCompositor/main.qml</file>
-    <file>qml/QmlCompositor/compositor.js</file>
-    <file>qml/QmlCompositor/ContrastEffect.qml</file>
-    <file>qml/QmlCompositor/WindowChrome.qml</file>
-    <file>qml/QmlCompositor/WindowContainer.qml</file>
-</qresource>
-</RCC>
-