Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Conflicts:
	src/gui/text/qfontdatabase.cpp
	src/gui/text/qharfbuzz_copy_p.h
	src/widgets/kernel/qapplication.cpp
	src/widgets/kernel/qcoreapplication.cpp

Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b

1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
index 07f105cb35..7884f398f3 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
@@ -65,6 +65,7 @@ template <class BaseClass>
 class QWindowsDialogHelperBase : public BaseClass
 {
 public:
+    ~QWindowsDialogHelperBase() { deleteNativeDialog(); }
 
     virtual void exec();
     virtual bool show(Qt::WindowFlags windowFlags,
@@ -73,19 +74,24 @@ public:
     virtual void hide();
     virtual QVariant styleHint(QPlatformDialogHelper::StyleHint) const;
 
-    virtual bool supportsNonModalDialog() const { return true; }
+    virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return true; }
 
 protected:
     QWindowsDialogHelperBase();
-    ~QWindowsDialogHelperBase();
     QWindowsNativeDialogBase *nativeDialog() const;
+    inline bool hasNativeDialog() const { return m_nativeDialog; }
+    void deleteNativeDialog();
+    void timerEvent(QTimerEvent *);
 
 private:
     virtual QWindowsNativeDialogBase *createNativeDialog() = 0;
     inline QWindowsNativeDialogBase *ensureNativeDialog();
+    inline void startDialogThread();
+    inline void stopTimer();
 
     QWindowsNativeDialogBase *m_nativeDialog;
     HWND m_ownerWindow;
+    int m_timerId;
 };
 
 QT_END_NAMESPACE