From 8f912c5c0f3f89e6f3042c0a948ccd155e57e216 Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Wed, 28 Sep 2011 09:52:15 +0200
Subject: Native file dialog support for Mac
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* New API: QPlatformDialogHelper to support native dialog on QPA.
    (Currently, It supports only file dialog.)
* Modify QDialog* and QFileDialog* to support native dialog.
* Add native file dialog support to cocoa platform plugin.

Change-Id: I957f046748a27a33fd9f8af3c525feabd1b0f582
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/widgets/dialogs/qdialog_p.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/widgets/dialogs/qdialog_p.h')

diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
index 3ee88f4703..04e0d7401c 100644
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@@ -58,6 +58,7 @@
 #include "QtCore/qpointer.h"
 #include "QtWidgets/qdialog.h"
 #include "QtWidgets/qpushbutton.h"
+#include "QtWidgets/qplatformdialoghelper_qpa.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -74,7 +75,7 @@ public:
           resizer(0),
           sizeGripEnabled(false),
 #endif
-          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(0)
+          rescode(0), resetModalityTo(-1), wasModalitySet(true), eventLoop(0), platformHelper(0)
         {}
 
     QPointer<QPushButton> mainDef;
@@ -97,15 +98,13 @@ public:
     void _q_doneAction();
 #endif
 
-#ifdef Q_WS_MAC
-    virtual void mac_nativeDialogModalHelp() {}
-#endif
-
     int rescode;
     int resetModalityTo;
     bool wasModalitySet;
 
     QPointer<QEventLoop> eventLoop;
+
+    QPlatformDialogHelper *platformHelper;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3