2 files changed, 16 insertions, 0 deletions
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index 7ed4e3fbc..141f701d1 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -172,6 +172,21 @@ QQuickPlatformFileDialog::~QQuickPlatformFileDialog()
     delete m_dlgHelper;
 }
 
+void QQuickPlatformFileDialog::setModality(Qt::WindowModality m)
+{
+#ifdef Q_OS_WIN
+    // A non-modal native file dialog is not possible on Windows, so
+    // be stubborn about it.  Emit modalityChanged() whether it changed
+    // or not, to ensure that anything which depends on the property
+    // will re-read the actual current value.
+    if (m != Qt::ApplicationModal)
+        m = Qt::ApplicationModal;
+    if (m == m_modality)
+        emit modalityChanged();
+#endif
+    QQuickAbstractFileDialog::setModality(m);
+}
+
 QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
 {
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h
index 411a78242..f21d01406 100644
--- a/src/dialogs/qquickplatformfiledialog_p.h
+++ b/src/dialogs/qquickplatformfiledialog_p.h
@@ -56,6 +56,7 @@ class QQuickPlatformFileDialog : public QQuickAbstractFileDialog
 public:
     QQuickPlatformFileDialog(QObject *parent = 0);
     virtual ~QQuickPlatformFileDialog();
+    virtual void setModality(Qt::WindowModality m) Q_DECL_OVERRIDE;
 
 protected:
     QPlatformFileDialogHelper *helper();