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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  remove pointless assignment of deprecated variable
  fix tst_headers
  Fixed a shell syntax error in configure
  Clear X11 structure before use
  Make operator QRectF const
  Fix GC-related crash in QScriptValue::setData()
  get rid of dependency on QtGui
  Removed implicity QtGui linking from icd.pro as it is not needed.
  DFB: Make sure QPixmap::hasAlpha is respected
  fix build on mingw
  Fix some painting issues in QDirectFBPaintEngine
  QNAM: Do not need QNetworkSession in AlwaysCache load mode
  Don't crash if QScriptClass property getter returns an invalid value
  QNAM: Remove dead waitForUpstreamBytesWritten() code
  QNAM: Remove dead waitForDownstreamReadyRead() code
  fix memleak in test

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 3334455..3b79129 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -385,7 +385,10 @@ static void DndReadSourceProperty(Display * dpy,
 static void DndWriteReceiverProperty(Display * dpy, Window window,
                                      unsigned char protocol_style)
 {
-    DndReceiverProp receiver_prop ;
+    DndReceiverProp receiver_prop;
+
+    // squelch potential valgrind errors about uninitialized reads
+    memset(&receiver_prop, 0, sizeof(receiver_prop));
 
     receiver_prop.byte_order = DndByteOrder() ;
     receiver_prop.protocol_version = DND_PROTOCOL_VERSION;