diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-10-24 09:20:41 +0300 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-24 10:48:05 +0200 |
| commit | 7d13f20e63698f64a2773c758ac4c0fc4c82892b (patch) | |
| tree | f1c1cdfde47eb22498cb10c0dac4005a88ea7ebe /examples | |
| parent | 3e7497a57581ffd19a767ef914d45ad782f78da8 (diff) | |
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 6 | ||||
| -rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.qrc | 5 | ||||
| -rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index f0aa50d57..139f46a86 100644 --- 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 index 000000000..20dd10a53 --- /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 ae192d91b..fbb255616 100644 --- 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); |