Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compiler warnings (unused variables).
  Compiler warnings.
  Fix crash with large ClientCutMessage
  Fix crash at exit and out of bounds write
  fix issue wrt posted events on Windows CE

5 files changed, 11 insertions, 10 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index cede810..e3f537f 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -516,8 +516,12 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp)
         if (q) {
             QEventDispatcherWin32Private *d = q->d_func();
             int localSerialNumber = d->serialNumber;
+#ifdef Q_OS_WINCE
+            MSG dummyMsg;
+            if (HIWORD(GetQueueStatus(QS_INPUT)) == 0
+                && PeekMessage(&dummyMsg, 0, WM_TIMER, WM_TIMER, PM_NOREMOVE) == 0
+#else
             if (HIWORD(GetQueueStatus(QS_INPUT | QS_RAWINPUT | QS_TIMER)) == 0
-#ifndef Q_OS_WINCE
                 || GetMessageTime() - d->lastMessageTime >= 10
 #endif
                 ) {
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
index 6796977..7ac2b17 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -213,15 +213,12 @@ void QDeclarativeAnchorsPrivate::centerInChanged()
 
     if (updatingCenterIn < 2) {
         ++updatingCenterIn;
-        QGraphicsItemPrivate *itemPrivate = QGraphicsItemPrivate::get(item);
         if (centerIn == item->parentItem()) {
-            QGraphicsItemPrivate *parentPrivate = QGraphicsItemPrivate::get(item->parentItem());
             QPointF p(hcenter(item->parentItem()) - hcenter(item) + hCenterOffset,
                       vcenter(item->parentItem()) - vcenter(item) + vCenterOffset);
             setItemPos(p);
 
         } else if (centerIn->parentItem() == item->parentItem()) {
-            QGraphicsItemPrivate *centerPrivate = QGraphicsItemPrivate::get(centerIn);
             QPointF p(centerIn->x() + hcenter(centerIn) - hcenter(item) + hCenterOffset,
                       centerIn->y() + vcenter(centerIn) - vcenter(item) + vCenterOffset);
             setItemPos(p);
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h
index 445f83d..101a8e7 100644
--- a/src/gui/painting/qgraphicssystem_runtime_p.h
+++ b/src/gui/painting/qgraphicssystem_runtime_p.h
@@ -170,7 +170,7 @@ public:
 
     int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; }
 
-    int memoryUsage() const { return m_memoryUsage; }
+    uint memoryUsage() const { return m_memoryUsage; }
 
 private:
 
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index f64d03b..d534f76 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -95,8 +95,8 @@ public:
         m_tags(0),
         m_contours(0),
         m_polygon_dev(0),
-        m_round_coords(false),
-        m_in_clip_elements(false)
+        m_in_clip_elements(false),
+        m_round_coords(false)
     {
     }
 
diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
index f5ad70c..3bafd97 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
@@ -1053,7 +1053,7 @@ void QVNCServer::clientCutText()
 {
     QRfbClientCutText ev;
 
-    if (ev.read(client)) {
+    if (cutTextPending == 0 && ev.read(client)) {
         cutTextPending = ev.length;
         if (!cutTextPending)
             handleMsg = false;
@@ -1481,7 +1481,7 @@ void QVNCServer::convertPixels(char *dst, const char *src, int count) const
             }
             if (count & 0x1) {
                 const quint16 *src16 = reinterpret_cast<const quint16*>(src);
-                dst32[count - 1] = qt_conv16ToRgb(src16[count - 1]);
+                *dst32 = qt_conv16ToRgb(src16[count - 1]);
             }
             return;
 #endif
@@ -2038,7 +2038,7 @@ void QVNCServer::discardClient()
     delete qvnc_cursor;
     qvnc_cursor = 0;
 #endif
-    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting)
+    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting && QWSServer::instance())
         QWSServer::instance()->enablePainting(false);
 }