diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 15:00:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-05 16:45:27 +0100 |
| commit | 8c0014213b97cf3bde80fbae63d5a46ad425673c (patch) | |
| tree | 4ce055a8b6f881ffdb514027b834292f3863ad69 /src/plugins/platforms/android/qandroidplatformtheme.cpp | |
| parent | c43133c81ea9abc10b42f1bd46c756167cad35d3 (diff) | |
| parent | 7644faa881d3054e79cf886dc60080ba33dd540a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformtheme.cpp')
| -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()))); |