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:
  More fix for QTBUG-14640:oci performance problem with qlonglong
  Doc: Fixing typo
  Fixed grabWidget sometimes returning uninitialized memory.
  Fix Malayalam Rendering - 'Ra' is PreBase
  Update .def files for QtGui and QtOpenVG
  Use 32bit textures for alpha textures after all.
  One more fix for dithering.
  Doc: Fixing typo
  Fix QTBUG-14640:oci performance problem with qlonglong
  32bit => 16bit conversion has 4byte-aligned output.
  Fix gcc bug in qReallocAligned
  Prevented threading related crash in OpenGL module.
  Fix possible crash in QStaticText and QDeclarativeTextLayout
  Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 64d8ed2..290c0f0 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1101,10 +1101,11 @@ QPixmap QPixmap::grabWidget(QWidget * widget, const QRect &rect)
     if (!r.intersects(widget->rect()))
         return QPixmap();
 
-    QPixmap res(r.size());
+    QImage res(r.size(), QImage::Format_ARGB32_Premultiplied);
+    res.fill(0);
     widget->d_func()->render(&res, QPoint(), r, QWidget::DrawWindowBackground
                              | QWidget::DrawChildren | QWidget::IgnoreMask, true);
-    return res;
+    return QPixmap::fromImage(res);
 }
 
 /*!