diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
| commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
| tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /src/plugins/platforms/android/src/qandroidplatformintegration.cpp | |
| parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
| parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'src/plugins/platforms/android/src/qandroidplatformintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp index 9ce382bd53..a3db421de9 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp @@ -42,7 +42,6 @@ #include "qandroidplatformintegration.h" #include "qabstracteventdispatcher.h" #include "androidjnimain.h" -#include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/qguiapplication.h> #include <qpa/qwindowsysteminterface.h> #include <QThread> |