diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 21:28:31 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-10-26 21:29:32 +0000 |
commit | e0d0e4a9a28dfede54c4c0ec4c42be05bc955d95 (patch) | |
tree | 2cc96e7943a2ad6d0a93bafc60504bbf6e3c8c3b /src/plugins/platforms/android/qandroidplatformscreen.h | |
parent | 00f35b4ae7f94e0fe1c8c77efec401ab5f3c4855 (diff) | |
parent | 6bc1ce9c164d0230508eafbe6c18144c8b1a6a74 (diff) | |
download | qtbase-e0d0e4a9a28dfede54c4c0ec4c42be05bc955d95.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformscreen.h')
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h index c01dbbc712..1b7bc91c83 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.h +++ b/src/plugins/platforms/android/qandroidplatformscreen.h @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE class QAndroidPlatformWindow; -class QAndroidPlatformBackingStore; class QAndroidPlatformScreen: public QObject, public QPlatformScreen, public AndroidSurfaceClient { |