Fixed qml-compositor warning and sizing when running as windowed.
authorSamuel Rødal <samuel.rodal@nokia.com>
Thu, 24 May 2012 11:25:07 +0000 (13:25 +0200)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Fri, 25 May 2012 07:18:53 +0000 (09:18 +0200)
Change-Id: Ic5b58cb1761e74408bd44a048e487617d59ee72d
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
examples/qml-compositor/main.cpp
examples/qml-compositor/main.qml

index 84e4e34..2a453a6 100644 (file)
@@ -152,6 +152,7 @@ int main(int argc, char *argv[])
 
     QmlCompositor compositor;
     compositor.setWindowTitle(QLatin1String("QML Compositor"));
+    compositor.setGeometry(0, 0, 1024, 768);
     compositor.show();
 
     compositor.rootContext()->setContextProperty("compositor", &compositor);
index a5cb8c5..1a6f5be 100644 (file)
@@ -45,7 +45,7 @@ Item {
     id: root
 
     property variant selectedWindow: null
-    property bool hasFullscreenWindow: compositor.fullscreenSurface !== null
+    property bool hasFullscreenWindow: typeof compositor != "undefined" && compositor.fullscreenSurface !== null
 
     onHasFullscreenWindowChanged: console.log("has fullscreen window: " + hasFullscreenWindow);