aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-05-22 15:17:56 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-22 19:46:35 +0200
commit04d4664167362e4f4158717ae7fce2cdccb77483 (patch)
treed93229cc53aa616072fed777ea0914ea88451d68 /tools
parent2f988d4b65428d03f3e3fee383787106b3f38c35 (diff)
qmlscene: don't call show() on the window if it's already showing
That way Component.onCompleted() can optionally do showMaximized() without being overridden. Task-number: QTBUG-31260 Change-Id: I6f5c3025efd3b38809be85da4172241695168a6c Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlscene/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index afc4be875c..df267c8f36 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -516,7 +516,7 @@ int main(int argc, char ** argv)
window->showFullScreen();
else if (options.maximized)
window->showMaximized();
- else
+ else if (!window->isVisible())
window->show();
}