summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/src/qandroidplatformintegration.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-22 16:12:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-22 16:12:53 +0100
commit0b250dd628dfd93f4f1077f066976dfab4d9d0fb (patch)
tree320571d840f9d59420d4fe684079a0228c22e49c /src/plugins/platforms/android/src/qandroidplatformintegration.h
parentef288db325d3c115e0cf5f458c657bdee60a432f (diff)
parentf3bf2efcbd4759dd7be96d9a3fc4719f01d472ba (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/plugins/platforms/android/src/qandroidplatformintegration.h')
-rw-r--r--src/plugins/platforms/android/src/qandroidplatformintegration.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.h b/src/plugins/platforms/android/src/qandroidplatformintegration.h
index bd08ad694c..474c1e837e 100644
--- a/src/plugins/platforms/android/src/qandroidplatformintegration.h
+++ b/src/plugins/platforms/android/src/qandroidplatformintegration.h
@@ -145,8 +145,9 @@ public:
QEglFSScreen *createScreen() const;
#endif
-private:
+ static bool needsWorkaround();
+private:
friend class QEglFSAndroidHooks;
QTouchDevice *m_touchDevice;