From 04d4664167362e4f4158717ae7fce2cdccb77483 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 22 May 2013 15:17:56 +0200 Subject: [PATCH] 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 Reviewed-by: Alan Alpert --- tools/qmlscene/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index afc4be8..df267c8 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(); } -- 2.7.4