aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-06-12 15:42:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-13 10:15:56 +0200
commite2da7e662d591b13fd30d16c6670f64fba45c973 (patch)
tree982de82d70e9c617ba7994ab5617c178cc8864e9
parent278139c5d7bfa338ff75c5225077976ece7490e0 (diff)
QFileDialogHelper: Force QWindow before setting flags.
Fixes a crash when clicking the dialog icon in the QtQuickControls gallery example. Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
-rw-r--r--src/imports/widgets/qquickqfiledialog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp
index 672c6d1bf4..4c5e1b6e37 100644
--- a/src/imports/widgets/qquickqfiledialog.cpp
+++ b/src/imports/widgets/qquickqfiledialog.cpp
@@ -96,6 +96,7 @@ public:
virtual void exec() { m_dialog.exec(); }
virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) {
+ m_dialog.winId();
m_dialog.windowHandle()->setTransientParent(parent);
m_dialog.windowHandle()->setFlags(f);
m_dialog.setWindowModality(m);