diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-01 11:01:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 23:57:21 +0100 |
| commit | 40fa7a816fae344f443ab7c4d431ded0179dace1 (patch) | |
| tree | 6caba03dc412712ac0a702ed286c41dd1323d0b2 /src/plugins | |
| parent | a31e3f9b8ab8328aeb288dd3b2e4f8f7b0cfe34b (diff) | |
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 2d5690fa4a..f7863ae427 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/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 diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h index db72e086ff..3ae22e69eb 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h +++ b/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 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 4b7202578a..ef8c69d18d 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/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 |