diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-12-11 13:51:48 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2014-12-15 14:16:11 +0100 |
| commit | 21101d9c52d2b7c6471f9814c9bff5aa87e22afc (patch) | |
| tree | 8029ea249533932df9f9abf1991e5be780240211 /src/plugins/platforms/android/qandroidplatformintegration.cpp | |
| parent | 3466950837e136e6032091491d0665823e4ac62f (diff) | |
Fix crash when Android Style is set more than once.
Load again JSON document is it was freed.
Task-number: QTBUG-43111
Change-Id: I22f1de221371b49fec8b3d66ad5f0bd2af9656fe
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformintegration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 07bdf95bf4..d94da65dde 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -79,8 +79,11 @@ void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteA if (resource == "QtActivity") return QtAndroid::activity(); if (resource == "AndroidStyleData") { - if (m_androidStyle) + if (m_androidStyle) { + if (m_androidStyle->m_styleData.isEmpty()) + m_androidStyle->m_styleData = AndroidStyle::loadStyleData(); return &m_androidStyle->m_styleData; + } else return Q_NULLPTR; } |