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/qandroidplatformintegration.cpp | |
| 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/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; } |