diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
| commit | 7644faa881d3054e79cf886dc60080ba33dd540a (patch) | |
| tree | 37610e42031ffd3bbb6522d7c6bd9070684b8d17 /src/plugins/platforms/android | |
| parent | e682ea6f782d3bb4caa4f2bd0e3be47cbe064f4f (diff) | |
| parent | 5367fa356233da4c0f28172a8f817791525f5457 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformtheme.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp index 8cece443b1..d9f062576b 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp @@ -278,7 +278,8 @@ static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette) const int pt = paletteType(key); if (pt > -1 || !qtClassName.isEmpty()) { // Extract palette information - QPalette palette; + QPalette palette = *defaultPalette; + attributeIterator = item.find(QLatin1String("defaultTextColorPrimary")); if (attributeIterator != item.constEnd()) palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble()))); |