Avoid qwindow-compositor crash on startup due to missing background.

Include background.jpg as a resource. This way it will be found
always.

Change-Id: I859a01b97fc81b704f8c632aab546b4b9905c375
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro
index f0aa50d..139f46a 100644 (file)
--- a/examples/qwindow-compositor/qwindow-compositor.pro
+++ b/examples/qwindow-compositor/qwindow-compositor.pro
@@ -42,8 +42,4 @@ HEADERS += \
     surfacerenderer.h \
     qwindowcompositor.h
 
-
-
-
-
-
+RESOURCES += qwindow-compositor.qrc

diff --git a/examples/qwindow-compositor/qwindow-compositor.qrc b/examples/qwindow-compositor/qwindow-compositor.qrc
new file mode 100644 (file)
index 0000000..20dd10a
--- /dev/null
+++ b/examples/qwindow-compositor/qwindow-compositor.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="background.jpg">../qml-compositor/background.jpg</file>
+    </qresource>
+</RCC>

diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp
index ae192d9..fbb2556 100644 (file)
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/qwindow-compositor/qwindowcompositor.cpp
@@ -4,7 +4,7 @@ QWindowCompositor::QWindowCompositor(QOpenGLWindow *window)
     : WaylandCompositor(window, window->context())
     , m_window(window)
 {
-    m_backgroundImage = QImage(QLatin1String("background.jpg"));
+    m_backgroundImage = QImage(QLatin1String(":/background.jpg"));
     m_renderer = new SurfaceRenderer(m_window->context(), m_window);
     m_backgroundTexture = m_renderer->textureFromImage(m_backgroundImage);