projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
2f988d4
)
qmlscene: don't call show() on the window if it's already showing
author
Shawn Rutledge
<shawn.rutledge@digia.com>
Wed, 22 May 2013 13:17:56 +0000 (15:17 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Wed, 22 May 2013 17:46:35 +0000 (19:46 +0200)
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>
tools/qmlscene/main.cpp
patch
|
blob
|
history
diff --git
a/tools/qmlscene/main.cpp
b/tools/qmlscene/main.cpp
index
afc4be8
..
df267c8
100644
(file)
--- 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();
}