summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-09-14 17:56:50 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-09-14 17:56:50 +0200
commit160e770efdd68125ec862b7f5efc94cc97e3935a (patch)
tree75cbb1804cc93dbb92710b7e2a93d3a94cb640d4
parentff7be0c06580924037c57b888dba8842070cbbcf (diff)
Fixed qml-compositor failing on XComposite EGL / GLX.HEADmaster
We also need to make sure that the QWindow has actually been created at this point, before creating a child window to be used as the fake root for composited windows.
-rw-r--r--src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp b/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
index ef935e6..9d8e86d 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
+++ b/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp
@@ -10,6 +10,8 @@ XCompositeHandler::XCompositeHandler(Wayland::Compositor *compositor, Display *d
, mwindow(window)
, mDisplay(display)
{
+ mCompositor->window()->create();
+
mFakeRootWidget = new QWindow(mCompositor->window());
mFakeRootWidget->setGeometry(QRect(-1,-1,1,1));
mFakeRootWidget->create();