diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-05-24 13:25:07 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-25 09:18:53 +0200 |
| commit | df7f26f9ede054e20e02cbcd18edfafb08ed06f4 (patch) | |
| tree | b0c4870a2254afc50a11788ed8c4b0145851ff40 /examples | |
| parent | 111eaf5d3f45ae0f70ebaa9fe8d5ae385eb110ac (diff) | |
| download | qtwayland-df7f26f9ede054e20e02cbcd18edfafb08ed06f4.tar.gz qtwayland-df7f26f9ede054e20e02cbcd18edfafb08ed06f4.tar.bz2 qtwayland-df7f26f9ede054e20e02cbcd18edfafb08ed06f4.zip | |
Fixed qml-compositor warning and sizing when running as windowed.
Change-Id: Ic5b58cb1761e74408bd44a048e487617d59ee72d
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qml-compositor/main.cpp | 1 | ||||
| -rw-r--r-- | examples/qml-compositor/main.qml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index 84e4e345..2a453a63 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -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); diff --git a/examples/qml-compositor/main.qml b/examples/qml-compositor/main.qml index a5cb8c5b..1a6f5be6 100644 --- a/examples/qml-compositor/main.qml +++ b/examples/qml-compositor/main.qml @@ -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); |