diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
| commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
| tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/plugins/platforms/android/qandroidplatformscreen.h | |
| parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformscreen.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h index 625e77840e..96a91fbf06 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.h +++ b/src/plugins/platforms/android/qandroidplatformscreen.h @@ -82,6 +82,7 @@ public: void scheduleUpdate(); void topWindowChanged(QWindow *w); + int rasterSurfaces(); public slots: void setDirty(const QRect &rect); @@ -110,6 +111,7 @@ private slots: private: int m_id = -1; + QAtomicInt m_rasterSurfaces = 0; ANativeWindow* m_nativeSurface = nullptr; QWaitCondition m_surfaceWaitCondition; }; |