diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/plugins/platforms/android/qandroidplatformtheme.h | |
parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
parent | 84569773db68408704193268bc42a200bb25a924 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformtheme.h')
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformtheme.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h index e842e672d6..2069910136 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.h +++ b/src/plugins/platforms/android/qandroidplatformtheme.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE struct AndroidStyle { + static QJsonObject loadStyleData(); QJsonObject m_styleData; QPalette m_standardPalette; QHash<int, QPalette> m_palettes; QHash<int, QFont> m_fonts; QHash<QByteArray, QFont> m_QWidgetsFonts; - QHash<QByteArray, QFont> m_QWidgetsPalettes; }; class QAndroidPlatformNativeInterface; |