diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-11-14 17:49:32 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-14 19:03:06 +0100 |
| commit | acd06b6ef6c65d1e6a53f551895194512901f595 (patch) | |
| tree | e83208cefe37dbd091dcdd13e1724df8ce48ba12 /src/plugins/platforms/android/qandroidplatformintegration.h | |
| parent | 4decaa566c1c7bcb29ed83cc8fed853c351f30dc (diff) | |
Set Android palette and fonts in QPA plugin.
Task-number: QTBUG-40621
Change-Id: Ibe069d4f93ac317e4f1b9ef5fc6bc3edcfac8685
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformintegration.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformintegration.h | 6 |
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 |