diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-24 09:55:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 11:20:01 +0200 |
| commit | 653e690923426dc8253e2adb155b1d108d934833 (patch) | |
| tree | 07bd575855ae1861a9e78ee70c672ddaf5baddc6 /src | |
| parent | 693a399acbff14718d1a0d48b8837741f1f55ccc (diff) | |
Windows: Do not use native dialogs for non-modal dialogs.
Windows file dialogs are always modal (inheriting IModalWindow).
As the QtQuick dialog plugin has a widget-based fallback now,
there is no need to use native dialogs for the non-modal case.
Task-number: QTBUG-30513
Change-Id: I8b62af86fde34e8c0cf5e917d2e62260e16c82fb
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 8565bf0204..5b84725edf 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -1457,9 +1457,7 @@ class QWindowsFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDi { public: QWindowsFileDialogHelper() {} - // For Qt 4 compatibility, do not create native non-modal dialogs on widgets, - // but only on QQuickWindows, which do not have a fallback. - virtual bool supportsNonModalDialog(const QWindow *parent = 0) const { return isQQuickWindow(parent); } + virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return false; } virtual bool defaultNameFilterDisables() const { return true; } virtual void setDirectory(const QString &directory); @@ -1853,7 +1851,7 @@ class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFile { public: QWindowsXpFileDialogHelper() {} - virtual bool supportsNonModalDialog(const QWindow *parent = 0) const { return isQQuickWindow(parent); } + virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return false; } virtual bool defaultNameFilterDisables() const { return true; } virtual void setDirectory(const QString &directory); |