diff options
Diffstat (limited to 'src/plugins/platforms/android')
5 files changed, 7 insertions, 16 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp index 33c422bb1e..09cc9ce8c6 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp @@ -25,10 +25,11 @@ void QAndroidPlatformBackingStore::flush(QWindow *window, const QRegion ®ion, { Q_UNUSED(offset); - if (!m_backingStoreSet) + auto *platformWindow = static_cast<QAndroidPlatformWindow *>(window->handle()); + if (!platformWindow->backingStore()) setBackingStore(window); - (static_cast<QAndroidPlatformWindow *>(window->handle()))->repaint(region); + platformWindow->repaint(region); } void QAndroidPlatformBackingStore::resize(const QSize &size, const QRegion &staticContents) @@ -42,7 +43,6 @@ void QAndroidPlatformBackingStore::resize(const QSize &size, const QRegion &stat void QAndroidPlatformBackingStore::setBackingStore(QWindow *window) { (static_cast<QAndroidPlatformWindow *>(window->handle()))->setBackingStore(this); - m_backingStoreSet = true; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.h b/src/plugins/platforms/android/qandroidplatformbackingstore.h index 810305ac45..b64a9f27bb 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.h +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.h @@ -21,7 +21,6 @@ public: void setBackingStore(QWindow *window); protected: QImage m_image; - bool m_backingStoreSet = false; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index 2f33816824..54c7a34efe 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -43,7 +43,7 @@ public: } private: - QElapsedTimer m_timer; + QTime m_timer; QString m_msg; }; diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp index 1bc4a04b98..b1eba17d04 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp @@ -5,9 +5,9 @@ #include "qandroidplatformwindow.h" #include "qandroidplatformopenglcontext.h" #include "qandroidplatformscreen.h" -#include "qandroidplatformbackingstore.h" + #include "androidjnimain.h" -#include "qpa/qplatformbackingstore.h" + #include <qguiapplication.h> #include <qpa/qwindowsysteminterface.h> #include <private/qhighdpiscaling_p.h> @@ -169,12 +169,4 @@ void QAndroidPlatformWindow::applicationStateChanged(Qt::ApplicationState) QWindowSystemInterface::flushWindowSystemEvents(); } -void QAndroidPlatformWindow::setBackingStore(QPlatformBackingStore *store) -{ - Q_ASSERT(store); - Q_ASSERT_X(dynamic_cast<QAndroidPlatformBackingStore *>(store), __FUNCTION__, - "Argument is not a QAndroidPlatformBackingStore."); - m_backingStore = static_cast<QAndroidPlatformBackingStore *>(store); -} - QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index ee2771ee11..6fccc2e7fe 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -50,7 +50,7 @@ public: virtual void applicationStateChanged(Qt::ApplicationState); - void setBackingStore(QPlatformBackingStore *store) override; + void setBackingStore(QAndroidPlatformBackingStore *store) { m_backingStore = store; } QAndroidPlatformBackingStore *backingStore() const { return m_backingStore; } virtual void repaint(const QRegion &) { } |