From: Samuel Rødal <samuel.rodal@nokia.com>
Date: Wed, 14 Sep 2011 15:56:50 +0000 (+0200)
Subject: Fixed qml-compositor failing on XComposite EGL / GLX.
X-Git-Tag: qt-v5.0.0-alpha1~216
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=160e770efdd68125ec862b7f5efc94cc97e3935a;p=profile%2Fivi%2Fqtwayland.git

Fixed qml-compositor failing on XComposite EGL / GLX.

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.
---

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();