Move QPlatformDialogs from QtWidgets to QtGui.

- Remove dependency of the Windows platform plugin on
  QtWidgets.

Change-Id: Iceb876ba7df46b49966af0fc101816654eedb5c5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

src/gui/kernel/kernel.pri

@@ -52,7 +52,8 @@ HEADERS += \
         kernel/qstylehints.h \
         kernel/qtouchdevice.h \
         kernel/qtouchdevice_p.h \
-        kernel/qplatformsharedgraphicscache_qpa.h
+        kernel/qplatformsharedgraphicscache_qpa.h \
+        kernel/qplatformdialoghelper_qpa.h
 
 SOURCES += \
         kernel/qclipboard_qpa.cpp \
@@ -93,7 +94,8 @@ SOURCES += \
         kernel/qshortcutmap.cpp \
         kernel/qstylehints.cpp \
         kernel/qtouchdevice.cpp \
-        kernel/qplatformsharedgraphicscache_qpa.cpp
+        kernel/qplatformsharedgraphicscache_qpa.cpp \
+        kernel/qplatformdialoghelper_qpa.cpp
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, egl) {
     HEADERS += \

src/gui/kernel/qplatformdialoghelper_qpa.h

@@ -65,7 +65,7 @@ class QColorDialogOptionsPrivate;
 class QFontDialogOptionsPrivate;
 class QFileDialogOptionsPrivate;
 
-class Q_WIDGETS_EXPORT QPlatformDialogHelper : public QObject
+class Q_GUI_EXPORT QPlatformDialogHelper : public QObject
 {
     Q_OBJECT
 public:
@@ -106,7 +106,7 @@ protected Q_SLOTS:
     void emitLaunchNativeAppModalPanel();
 };
 
-class Q_WIDGETS_EXPORT QColorDialogOptions
+class Q_GUI_EXPORT QColorDialogOptions
 {
 public:
     enum ColorDialogOption {
@@ -143,7 +143,7 @@ private:
     QSharedDataPointer<QColorDialogOptionsPrivate> d;
 };
 
-class Q_WIDGETS_EXPORT QPlatformColorDialogHelper : public QPlatformDialogHelper
+class Q_GUI_EXPORT QPlatformColorDialogHelper : public QPlatformDialogHelper
 {
     Q_OBJECT
 public:
@@ -161,7 +161,7 @@ private:
     QSharedPointer<QColorDialogOptions> m_options;
 };
 
-class Q_WIDGETS_EXPORT QFontDialogOptions
+class Q_GUI_EXPORT QFontDialogOptions
 {
 public:
     enum FontDialogOption {
@@ -188,7 +188,7 @@ private:
     QSharedDataPointer<QFontDialogOptionsPrivate> d;
 };
 
-class Q_WIDGETS_EXPORT QPlatformFontDialogHelper : public QPlatformDialogHelper
+class Q_GUI_EXPORT QPlatformFontDialogHelper : public QPlatformDialogHelper
 {
     Q_OBJECT
 public:
@@ -206,7 +206,7 @@ private:
     QSharedPointer<QFontDialogOptions> m_options;
 };
 
-class Q_WIDGETS_EXPORT QFileDialogOptions
+class Q_GUI_EXPORT QFileDialogOptions
 {
 public:
     enum ViewMode { Detail, List };
@@ -280,7 +280,7 @@ private:
     QSharedDataPointer<QFileDialogOptionsPrivate> d;
 };
 
-class Q_WIDGETS_EXPORT QPlatformFileDialogHelper : public QPlatformDialogHelper
+class Q_GUI_EXPORT QPlatformFileDialogHelper : public QPlatformDialogHelper
 {
     Q_OBJECT
 public:

src/plugins/platforms/windows/qwindowsdialoghelpers.cpp

@@ -41,8 +41,6 @@
 
 #include "qwindowsdialoghelpers.h"
 
-#ifdef QT_WIDGETS_LIB
-
 #include "qwindowscontext.h"
 #include "qwindowswindow.h"
 
@@ -1387,5 +1385,3 @@ QPlatformDialogHelper *createHelper(QPlatformTheme::DialogType type)
 QT_END_NAMESPACE
 
 #include "qwindowsdialoghelpers.moc"
-
-#endif // QT_WIDGETS_LIB

src/plugins/platforms/windows/qwindowsdialoghelpers.h

@@ -42,10 +42,8 @@
 #ifndef QWINDOWSDIALOGHELPER_H
 #define QWINDOWSDIALOGHELPER_H
 
-#ifdef QT_WIDGETS_LIB
-
 #include "qtwindows_additional.h"
-#include <QtWidgets/qplatformdialoghelper_qpa.h>
+#include <QtGui/QPlatformDialogHelper>
 #include <QtGui/QPlatformTheme>
 #include <QtCore/QStringList>
 
@@ -95,5 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_WIDGETS_LIB
 #endif // QWINDOWSDIALOGHELPER_H

src/plugins/platforms/windows/windows.pro

@@ -4,8 +4,6 @@ load(qt_plugin)
 QT *= core-private
 QT *= gui-private
 QT *= platformsupport-private
-# ### fixme: Remove widgets dependencies of dialog helpers
-QT *= widgets
 
 INCLUDEPATH += ../../../3rdparty/harfbuzz/src
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms

src/widgets/dialogs/qdialog_p.h

@@ -58,7 +58,7 @@
 #include "QtCore/qpointer.h"
 #include "QtWidgets/qdialog.h"
 #include "QtWidgets/qpushbutton.h"
-#include "QtWidgets/qplatformdialoghelper_qpa.h"
+#include <QtGui/QPlatformDialogHelper>
 
 QT_BEGIN_NAMESPACE
 

src/widgets/dialogs/qfiledialog.cpp

@@ -45,7 +45,6 @@
 
 #ifndef QT_NO_FILEDIALOG
 #include "qfiledialog_p.h"
-#include "qplatformdialoghelper_qpa.h"
 #include <private/qguiapplication_p.h>
 #include <qfontmetrics.h>
 #include <qaction.h>

src/widgets/kernel/kernel.pri

@@ -44,8 +44,7 @@ HEADERS += \
         kernel/qguiplatformplugin_p.h \
         kernel/qdesktopwidget_qpa_p.h \
         kernel/qwidgetwindow_qpa_p.h \
-        kernel/qplatformmenu_qpa.h \
+        kernel/qplatformmenu_qpa.h
-        kernel/qplatformdialoghelper_qpa.h
 
 SOURCES += \
 	kernel/qaction.cpp \
@@ -81,8 +80,7 @@ SOURCES += \
         kernel/qdesktopwidget_qpa.cpp \
         kernel/qwidget_qpa.cpp \
         kernel/qwidgetwindow_qpa.cpp \
-        kernel/qplatformmenu_qpa.cpp \
+        kernel/qplatformmenu_qpa.cpp
-        kernel/qplatformdialoghelper_qpa.cpp
 
 # TODO
 false:!x11:mac {