Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I95f235a66ce2e9b1fa435c0f911c6f7e811755f0

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformintegration.h b/src/plugins/platforms/android/qandroidplatformintegration.h
index 13c98442e9..7b4ab08847 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.h
+++ b/src/plugins/platforms/android/qandroidplatformintegration.h
@@ -44,6 +44,8 @@
 
 #include "qandroidplatformscreen.h"
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QDesktopWidget;
@@ -51,12 +53,12 @@ class QAndroidPlatformServices;
 class QAndroidSystemLocale;
 class QPlatformAccessibility;
 
+struct AndroidStyle;
 class QAndroidPlatformNativeInterface: public QPlatformNativeInterface
 {
 public:
     void *nativeResourceForIntegration(const QByteArray &resource);
-    QHash<int, QPalette> m_palettes;
-    QHash<int, QFont> m_fonts;
+    std::shared_ptr<AndroidStyle> m_androidStyle;
 };
 
 class QAndroidPlatformIntegration : public QPlatformIntegration