diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-09 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-09 23:00:13 (GMT) |
| commit | 5fd0681139bc29291f8c1cf93362b832f9ded589 (patch) | |
| tree | f237124aa90e9287f59f59c91bd230ad1b40ca33 /src/gui | |
| parent | 915c8a684b13ace823da28be5da64ae15de4472f (diff) | |
| parent | 4c1c1b502ecaa2add525362e97629a58969adb0f (diff) | |
| download | Qt-5fd0681139bc29291f8c1cf93362b832f9ded589.zip Qt-5fd0681139bc29291f8c1cf93362b832f9ded589.tar.gz Qt-5fd0681139bc29291f8c1cf93362b832f9ded589.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui')
| -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; } |