Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/declarative/righttoleft.qdoc
	examples/draganddrop/fridgemagnets/main.cpp
	examples/script/context2d/main.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index cb30161..bdf1f90 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -648,7 +648,7 @@ void QMacPixmapData::macCreatePixels()
     }
 
     if (pixels)
-        memcpy(base_pixels, pixels, pixelsSize);
+        memcpy(base_pixels, pixels, qMin(pixelsSize, (uint) numBytes));
     pixels = base_pixels;
     pixelsSize = numBytes;
 }