QS60Style: Re-enable color-from-skin-part extraction

After introducing native pixmap support, we had some crashes
on certain setups (e.g. 3.2 Emulator) when accessing data
that came from native pixmaps (FBServ). However, after fix
064674426ef0c446561b0c338441bb7d5ca091bf this is not
reproducable, anymore. Therefore let's re-enable color
extraction and enjoy better color palettes.

Reviewed-By: Sami Merilä

1 files changed, 4 insertions, 5 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 6bdb79e..59787da 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -706,11 +706,10 @@ void QS60StylePrivate::setThemePalette(QPalette *palette) const
     palette->setColor(QPalette::AlternateBase, Qt::transparent);
     palette->setBrush(QPalette::Base, Qt::transparent);
     // set button and tooltipbase based on pixel colors
-// After natitive pixmap support, colorFromFrameGraphics caused reproducable crashes on some setups.
-//    const QColor buttonColor = colorFromFrameGraphics(SF_ButtonNormal);
-//    palette->setColor(QPalette::Button, buttonColor);
-//    const QColor toolTipColor = colorFromFrameGraphics(SF_ToolTip);
-//    palette->setColor(QPalette::ToolTipBase, toolTipColor);
+    const QColor buttonColor = colorFromFrameGraphics(SF_ButtonNormal);
+    palette->setColor(QPalette::Button, buttonColor);
+    const QColor toolTipColor = colorFromFrameGraphics(SF_ToolTip);
+    palette->setColor(QPalette::ToolTipBase, toolTipColor);
     palette->setColor(QPalette::Light, palette->color(QPalette::Button).lighter());
     palette->setColor(QPalette::Dark, palette->color(QPalette::Button).darker());
     palette->setColor(QPalette::Midlight, palette->color(QPalette::Button).lighter(125));