Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensource

Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb

1 files changed, 7 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index 5dc158e351..54b3c5b8a8 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -106,12 +106,14 @@ private:
     QDpi logicalBaseDpi() const override;
     Qt::ScreenOrientation orientation() const override;
     Qt::ScreenOrientation nativeOrientation() const override;
+    QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
     void surfaceChanged(JNIEnv *env, jobject surface, int w, int h) override;
     void releaseSurface();
     void applicationStateChanged(Qt::ApplicationState);
+    QPixmap doScreenShot(QRect grabRect = QRect());
 
 private slots:
-    void doRedraw();
+    void doRedraw(QImage *screenGrabImage = nullptr);
 
 private:
     int m_id = -1;
@@ -119,6 +121,10 @@ private:
     ANativeWindow* m_nativeSurface = nullptr;
     QWaitCondition m_surfaceWaitCondition;
     QSize m_size;
+
+    QImage m_lastScreenshot;
+    QImage::Format m_pixelFormat = QImage::Format_RGBA8888_Premultiplied;
+    bool m_repaintOccurred = false;
 };
 
 QT_END_NAMESPACE