diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 12:52:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 12:52:13 (GMT) |
| commit | 24753b5a35565f515d2ef63b09a87a015f9c37bf (patch) | |
| tree | 9d2771e13b66562c1f86291e009b37bcdfa965a3 | |
| parent | 1fc2dcd798cf984d59568c1f681c830ce16bda1e (diff) | |
| parent | 99aef9769379a74accce481f6290a30bf8024216 (diff) | |
| download | Qt-24753b5a35565f515d2ef63b09a87a015f9c37bf.zip Qt-24753b5a35565f515d2ef63b09a87a015f9c37bf.tar.gz Qt-24753b5a35565f515d2ef63b09a87a015f9c37bf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Regression: Some QMenus are shown completely transparent in Symbian
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 13157ff..bb2d701 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -506,8 +506,10 @@ bool QS60StylePrivate::equalToThemePalette(qint64 cacheKey, QPalette::ColorRole { if (!m_themePalette) return false; - if (cacheKey == m_themePalette->brush(role).texture().cacheKey()) + if ((m_placeHolderTexture && (cacheKey == m_placeHolderTexture->cacheKey())) + || (cacheKey == m_themePalette->brush(role).texture().cacheKey())) return true; + return false; } |