diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-24 06:17:35 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-25 22:18:15 +0100 |
| commit | 02e20f772d4e07c0eed80d1aa11938787b763eca (patch) | |
| tree | 6fc1cf14a0b641189181d1b7cc82deb5a0e0e33f /src/plugins/platforms/android/qandroidplatformtheme.h | |
| parent | 77f800bad71f093739ffdab7ac088194978deceb (diff) | |
[QAndroidPlatformTheme] Get rid of static QFont
QFont is not POD and shouldn't be instantiated statically,
otherwise we could end up with UB during qApp destruction.
Change-Id: I2372c7a643eb3007957ab2b798732c1a18fd0ae5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformtheme.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformtheme.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h index 334e86ad7a..e842e672d6 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.h +++ b/src/plugins/platforms/android/qandroidplatformtheme.h @@ -35,6 +35,7 @@ #define QANDROIDPLATFORMTHEME_H #include <qpa/qplatformtheme.h> +#include <QtGui/qfont.h> #include <QtGui/qpalette.h> #include <QJsonObject> @@ -73,6 +74,7 @@ public: private: std::shared_ptr<AndroidStyle> m_androidStyleData; QPalette m_defaultPalette; + QFont m_systemFont; }; QT_END_NAMESPACE |