From 014ad6bf1b2fc0445933a11ab44275f0d99b8d32 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 7 May 2012 10:22:49 +0200
Subject: [PATCH] Windows: Disable Non-modal native file dialogs.

Disable dialogs, add explanatory comment. This is now
equivalent to Qt 4.

Change-Id: Ib6f4853d6f7ef1812bd5887d3ced8d7c8d1db5c8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index e2c3b6a059..ea47d0abb2 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1088,6 +1088,13 @@ QWindowsNativeFileDialogBase *QWindowsNativeFileDialogBase::create(QFileDialogOp
     \class QWindowsFileDialogHelper
     \brief Helper for native Windows file dialogs
 
+    Non-modal dialogs are disabled for now. The functionality is
+    implemented in principle, however there are failures
+    when querying the results from a dialog run in another thread.
+    This could probably be fixed be calling CoInitializeEx() with
+    the right parameters from each thread. The problem is though
+    that calls to CoInitialize() occur in several places in Qt.
+
     \ingroup qt-lighthouse-win
 */
 
@@ -1095,6 +1102,7 @@ class QWindowsFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDi
 {
 public:
     QWindowsFileDialogHelper() {}
+    virtual bool supportsNonModalDialog() const { return false; }
 
     virtual bool defaultNameFilterDisables() const
         { return true; }