diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-18 14:19:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-18 14:19:36 +0100 |
| commit | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (patch) | |
| tree | 9ba857247c0862fa6636766fad9cdab146c9c19b /src/plugins | |
| parent | f4044e853cdb66a7f7f7e61df78434243b85b03d (diff) | |
| parent | 21fbca97a8ee284ff6ffaff64c180700cc5537ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0
Diffstat (limited to 'src/plugins')
4 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index c904ddb3ac..28a5da4b5d 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -63,7 +63,6 @@ #include "androidjnimenu.h" #include "qandroidplatformdialoghelpers.h" #include "qandroidplatformintegration.h" -#include <QtWidgets/QApplication> #include <qabstracteventdispatcher.h> diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp index fa123827e7..e76eedbfd9 100644 --- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp +++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#include <QtWidgets/QApplication> -#include <QtWidgets/QStyle> #include "qandroidplatformdialoghelpers.h" #include "androidjnimain.h" #include <private/qguiapplication_p.h> diff --git a/src/plugins/platforms/android/qandroidplatformintegration.h b/src/plugins/platforms/android/qandroidplatformintegration.h index 0dc2415337..2d685bc567 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.h +++ b/src/plugins/platforms/android/qandroidplatformintegration.h @@ -45,7 +45,6 @@ #include <qpa/qplatformintegration.h> #include <qpa/qplatformmenu.h> #include <qpa/qplatformnativeinterface.h> -#include <QtWidgets/QAction> #include <EGL/egl.h> #include <jni.h> diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h index 9df445ef17..fecd7ca8e9 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.h +++ b/src/plugins/platforms/android/qandroidplatformtheme.h @@ -43,7 +43,7 @@ #define QANDROIDPLATFORMTHEME_H #include <qpa/qplatformtheme.h> -#include <QPalette> +#include <QtGui/qpalette.h> class QAndroidPlatformNativeInterface; class QAndroidPlatformTheme: public QPlatformTheme |