diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-08 16:05:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-08 16:05:37 (GMT) |
| commit | 3b7b6b5192e943f13629b1790613ee8ae263eba3 (patch) | |
| tree | 7f76e5d94e71cdb88c0d8368b1a28a026ce17e46 /src/gui/styles | |
| parent | 4f8978312a8897e27b2e548fe85f2a76402aa17a (diff) | |
| parent | c47d821917a2761fb991eea4f0cfff62ac836011 (diff) | |
| download | Qt-3b7b6b5192e943f13629b1790613ee8ae263eba3.zip Qt-3b7b6b5192e943f13629b1790613ee8ae263eba3.tar.gz Qt-3b7b6b5192e943f13629b1790613ee8ae263eba3.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/styles')
| -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 de45754..e9f7a86 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -501,8 +501,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; } |