diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-05-22 17:18:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-23 13:31:48 +0200 |
| commit | 745621a90bde2b01de144cb288302f7d4944a682 (patch) | |
| tree | 25d5ace2ceaa5e2821bf55db179db2e0b27f7fe7 /tools/qmlscene/main.cpp | |
| parent | 8a3d48915c29484c9ffb2fb8f0e3b569a9fe9b44 (diff) | |
qmlscene: Set window flags correctly.
Task-number: QTBUG-31258
Change-Id: I13dfc17c75075de155505d20c57400753de0a71d
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'tools/qmlscene/main.cpp')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index df267c8f36..d572487218 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -491,7 +491,6 @@ int main(int argc, char ** argv) // Set window default properties; the qml can still override them QString oname = contentItem->objectName(); window->setTitle(oname.isEmpty() ? QString::fromLatin1("qmlscene") : QString::fromLatin1("qmlscene: ") + oname); - window->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint); if (options.resizeViewToRootItem) qxView->setResizeMode(QQuickView::SizeViewToRootObject); else @@ -512,6 +511,9 @@ int main(int argc, char ** argv) } window->setFormat(surfaceFormat); + if (window->flags() == Qt::Window) // Fix window flags unless set by QML. + window->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint); + if (options.fullscreen) window->showFullScreen(); else if (options.maximized) |