1 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 7307d52cf9..b6ff3dc3ce 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -880,7 +880,7 @@ public:
     inline static QWindowsNativeFileDialogBase *create(QFileDialogOptions::AcceptMode am, const QWindowsFileDialogSharedData &data);
 
     virtual void setWindowTitle(const QString &title);
-    inline void setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::FileDialogOptions options);
+    inline void setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::AcceptMode acceptMode, QFileDialogOptions::FileDialogOptions options);
     inline void setDirectory(const QString &directory);
     inline void updateDirectory() { setDirectory(m_data.directory().toLocalFile()); }
     inline QString directory() const;
@@ -1037,14 +1037,17 @@ void QWindowsNativeFileDialogBase::doExec(HWND owner)
     }
 }
 
-void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode, QFileDialogOptions::FileDialogOptions options)
+void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode,
+                                           QFileDialogOptions::AcceptMode acceptMode,
+                                           QFileDialogOptions::FileDialogOptions options)
 {
     DWORD flags = FOS_PATHMUSTEXIST | FOS_FORCESHOWHIDDEN;
     if (options & QFileDialogOptions::DontResolveSymlinks)
         flags |= FOS_NODEREFERENCELINKS;
     switch (mode) {
     case QFileDialogOptions::AnyFile:
-        flags |= FOS_NOREADONLYRETURN;
+        if (acceptMode == QFileDialogOptions::AcceptSave)
+            flags |= FOS_NOREADONLYRETURN;
         if (!(options & QFileDialogOptions::DontConfirmOverwrite))
             flags |= FOS_OVERWRITEPROMPT;
         break;
@@ -1059,8 +1062,9 @@ void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode, QF
         flags |= FOS_FILEMUSTEXIST | FOS_ALLOWMULTISELECT;
         break;
     }
-    qCDebug(lcQpaDialogs) << __FUNCTION__ << " mode=" << mode << " options"
-        << options << " results in 0x" << flags;
+    qCDebug(lcQpaDialogs) << __FUNCTION__ << "mode=" << mode
+        << "acceptMode=" << acceptMode << "options=" << options
+        << "results in" << showbase << hex << flags;
 
     if (FAILED(m_fileDialog->SetOptions(flags)))
         qErrnoWarning("%s: SetOptions() failed", __FUNCTION__);
@@ -1592,7 +1596,7 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
     m_data.fromOptions(opts);
     const QFileDialogOptions::FileMode mode = opts->fileMode();
     result->setWindowTitle(opts->windowTitle());
-    result->setMode(mode, opts->options());
+    result->setMode(mode, opts->acceptMode(), opts->options());
     result->setHideFiltersDetails(opts->testOption(QFileDialogOptions::HideNameFilterDetails));
     const QStringList nameFilters = opts->nameFilters();
     if (!nameFilters.isEmpty())