From 130fc63e048272235f1f13580d682abed16b3af2 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Wed, 12 Aug 2009 09:29:55 +0200
Subject: Surrounded a string const with QString() to get snippet to work.

Task-number: 258967
---
 doc/src/snippets/code/src_corelib_io_qdatastream.cpp | 2 +-
 tools/qdoc3/htmlgenerator.cpp                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/src/snippets/code/src_corelib_io_qdatastream.cpp b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
index fd6d564..c1f3469 100644
--- a/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
@@ -5,7 +5,7 @@ void wrapInFunction()
 QFile file("file.dat");
 file.open(QIODevice::WriteOnly);
 QDataStream out(&file);   // we will serialize the data into the file
-out << "the answer is";   // serialize a string
+out << QString("the answer is");   // serialize a string
 out << (qint32)42;        // serialize an integer
 //! [0]
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 56c4886..84e330f 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3426,6 +3426,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         
         if (!notifiers.members.isEmpty()) {
             out() << "<p><b>Notifier signal:</b></p>\n";
+            //out() << "<p>This signal is emitted when the property value is changed.</p>\n";
             generateSectionList(notifiers, node, marker, CodeMarker::Accessors);
         }
     }
-- 
cgit v0.12


From 0cfe640f20a7f427d4da79386cbd8cd18481c019 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 12 Aug 2009 09:42:26 +0200
Subject: Compile fix for Windows CE standard SDK

Q_WS_SINCE_WM ifdefs were broken

Reviewed-by: Joerg
---
 src/gui/styles/qwindowsmobilestyle.cpp | 8 +++++---
 src/gui/styles/qwindowsmobilestyle_p.h | 6 +++---
 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());
 
 };
 
-- 
cgit v0.12