summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-05-25 07:53:00 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-05-25 07:53:00 (GMT)
commit662494c7a20d6612948a672e5e9c87b9173d9560 (patch)
tree1220d961728e1f45f01829ffb4d8059c3317de77 /src
parent377a0ece82b91e00e4fc8935a73dc18cd218abf4 (diff)
downloadQt-662494c7a20d6612948a672e5e9c87b9173d9560.zip
Qt-662494c7a20d6612948a672e5e9c87b9173d9560.tar.gz
Qt-662494c7a20d6612948a672e5e9c87b9173d9560.tar.bz2
S60Style: Change QTreeView elements to be non-color-skinnable.
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qs60style.cpp6
-rw-r--r--src/gui/styles/qs60style_symbian.cpp5
2 files changed, 2 insertions, 9 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index f690f1d..e65d98f 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2109,10 +2109,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
drawSkinPart = true;
}
- if ( drawSkinPart ) {
- QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect,
- (flags | QS60StylePrivate::SF_ColorSkinned));
- }
+ if ( drawSkinPart )
+ QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags);
if (option->state & State_Children) {
QS60StyleEnums::SkinParts skinPart =
diff --git a/src/gui/styles/qs60style_symbian.cpp b/src/gui/styles/qs60style_symbian.cpp
index fd96a2b..92e806a 100644
--- a/src/gui/styles/qs60style_symbian.cpp
+++ b/src/gui/styles/qs60style_symbian.cpp
@@ -1311,11 +1311,6 @@ void QS60StyleModeSpecifics::colorGroupAndIndex(
{
switch(skinID) {
case QS60StyleEnums::SP_QgnIndiSubMenu:
- case QS60StyleEnums::SP_QgnIndiHlColSuper:
- case QS60StyleEnums::SP_QgnIndiHlExpSuper:
- case QS60StyleEnums::SP_QgnIndiHlLineBranch:
- case QS60StyleEnums::SP_QgnIndiHlLineEnd:
- case QS60StyleEnums::SP_QgnIndiHlLineStraight:
colorGroup = KAknsIIDQsnIconColors;
colorIndex = EAknsCIQsnIconColorsCG1;
break;