From 0d597176e839c508e08a01707c6438fcff4c7054 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Mon, 9 Jun 2014 11:44:32 +0300 Subject: Fix creation of custom shells The previous virtual method initShell() was not working because it was called from QWaylandCompositor constructor. Replace that with a mthod to create the default shell to be manually called by the compositors if they so choose. Change-Id: I35a1dc0edfaf4237ca47b532645ac0d95752311c Reviewed-by: Laszlo Agocs --- examples/qml-compositor/main.cpp | 1 + examples/qwindow-compositor/qwindowcompositor.cpp | 1 + examples/server-buffer/compositor/main.cpp | 1 + 3 files changed, 3 insertions(+) (limited to 'examples') diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index 91bc6677f..26e730d43 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -67,6 +67,7 @@ public: setResizeMode(QQuickView::SizeRootObjectToView); setColor(Qt::black); winId(); + addDefaultShell(); connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks())); } diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp index 925e3214f..2cb1b3624 100644 --- a/examples/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/qwindow-compositor/qwindowcompositor.cpp @@ -132,6 +132,7 @@ QWindowCompositor::QWindowCompositor(QOpenGLWindow *window) setOutputGeometry(QRect(QPoint(0, 0), window->size())); setOutputRefreshRate(qRound(qGuiApp->primaryScreen()->refreshRate() * 1000.0)); + addDefaultShell(); } QWindowCompositor::~QWindowCompositor() diff --git a/examples/server-buffer/compositor/main.cpp b/examples/server-buffer/compositor/main.cpp index 77c3a1a08..85503c62b 100644 --- a/examples/server-buffer/compositor/main.cpp +++ b/examples/server-buffer/compositor/main.cpp @@ -82,6 +82,7 @@ public: setColor(Qt::black); create(); grabWindow(); + addDefaultShell(); connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks())); -- cgit v1.2.3