Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

2 files changed, 8 insertions, 6 deletions

diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp
index db91c87..09d345a 100644
--- a/src/gui/styles/qwindowsmobilestyle.cpp
+++ b/src/gui/styles/qwindowsmobilestyle.cpp
@@ -4041,6 +4041,8 @@ void tintImage(QImage *image, QColor color, qreal saturation)
 
 enum QSliderDirection { SliderUp, SliderDown, SliderLeft, SliderRight };
 
+#ifdef Q_WS_WINCE_WM
+
 void QWindowsMobileStylePrivate::tintImagesButton(QColor color)
 {
        if (currentTintButton == color)
@@ -4096,6 +4098,8 @@ void QWindowsMobileStylePrivate::tintListViewHighlight(QColor color)
      }
 }
 
+#endif //Q_WS_WINCE_WM
+
 void QWindowsMobileStylePrivate::setupWindowsMobileStyle65()
 {
 #ifdef Q_WS_WINCE_WM
@@ -6443,13 +6447,11 @@ QRect QWindowsMobileStyle::subControlRect(ComplexControl control, const QStyleOp
 
 #ifdef Q_WS_WINCE_WM
             if (d->wm65)
-#else
-            if (false)
-#endif //Q_WS_WINCE_WM
             {
                 sliderButtonExtent = d->imageScrollbarHandleUp.width();
                 sliderButtonExtentDir = d->imageScrollbarHandleUp.height();
             }
+#endif //Q_WS_WINCE_WM
 
             int sliderlen;
             int maxlen = ((scrollbar->orientation == Qt::Horizontal) ?
diff --git a/src/gui/styles/qwindowsmobilestyle_p.h b/src/gui/styles/qwindowsmobilestyle_p.h
index 3a05af1..87ce782 100644
--- a/src/gui/styles/qwindowsmobilestyle_p.h
+++ b/src/gui/styles/qwindowsmobilestyle_p.h
@@ -114,15 +114,15 @@ public:
     void tintImagesHigh(QColor color);
     void tintImagesButton(QColor color);
     void tintListViewHighlight(QColor color);
-    void drawPanelItemViewSelected(QPainter *painter, const QStyleOptionViewItemV4 *option, QRect rect = QRect());
+
+#endif //Q_WS_WINCE_WM
 
     void drawScrollbarHandleUp(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
     void drawScrollbarHandleDown(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
     void drawScrollbarGroove(QPainter *p, const QStyleOptionSlider *opt);
     void drawScrollbarGrip(QPainter *p, QStyleOptionSlider *newScrollbar, const QStyleOptionComplex *option, bool drawCompleteFrame);
     void drawTabBarTab(QPainter *p, const QStyleOptionTab *tab);
-
-#endif //Q_WS_WINCE_WM
+    void drawPanelItemViewSelected(QPainter *painter, const QStyleOptionViewItemV4 *option, QRect rect = QRect());
 
 };