diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:15:09 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:15:26 +0200 |
commit | a2457771ed7c4ab533a7d2a00c9e26661c3062db (patch) | |
tree | 858a378c3ddb70421266c463d3e91ddf653450a0 /src | |
parent | 5d4b006181d009e6245d5d38c7798603ddcab06a (diff) | |
parent | 24947fb8cc1859d5d193b2d66746c1541f30ab9b (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/widgets/qquickqcolordialog.cpp | 7 | ||||
-rw-r--r-- | src/imports/widgets/qquickqfiledialog.cpp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/imports/widgets/qquickqcolordialog.cpp b/src/imports/widgets/qquickqcolordialog.cpp index abe6ffd004..d10eacee60 100644 --- a/src/imports/widgets/qquickqcolordialog.cpp +++ b/src/imports/widgets/qquickqcolordialog.cpp @@ -68,8 +68,11 @@ public: virtual void exec() { m_dialog.exec(); } virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { - m_dialog.windowHandle()->setTransientParent(parent); - m_dialog.windowHandle()->setFlags(f); + m_dialog.winId(); + QWindow *window = m_dialog.windowHandle(); + Q_ASSERT(window); + window->setTransientParent(parent); + window->setFlags(f); m_dialog.setWindowModality(m); m_dialog.setWindowTitle(QPlatformColorDialogHelper::options()->windowTitle()); m_dialog.setOptions((QColorDialog::ColorDialogOptions)((int)(QPlatformColorDialogHelper::options()->options()))); diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index 672c6d1bf4..afb150b509 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -96,8 +96,11 @@ public: virtual void exec() { m_dialog.exec(); } virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { - m_dialog.windowHandle()->setTransientParent(parent); - m_dialog.windowHandle()->setFlags(f); + m_dialog.winId(); + QWindow *window = m_dialog.windowHandle(); + Q_ASSERT(window); + window->setTransientParent(parent); + window->setFlags(f); m_dialog.setWindowModality(m); m_dialog.show(); return m_dialog.isVisible(); |