Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	examples/declarative/positioners/layoutdirection/layoutdirection.qml
	src/corelib/global/qglobal.h
	src/plugins/qpluginbase.pri
	src/qbase.pri
	src/s60installs/bwins/QtOpenGLu.def
	src/s60installs/eabi/QtOpenGLu.def
	tests/auto/selftests/expected_cmptest.txt
	tests/auto/selftests/expected_crashes_3.txt
	tests/auto/selftests/expected_longstring.txt
	tests/auto/selftests/expected_maxwarnings.txt
	tests/auto/selftests/expected_skip.txt
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qdeclarative.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
	tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf

1 files changed, 4 insertions, 4 deletions

diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index 2924d4142a..0d2ed9e6d2 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -195,14 +195,16 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         if (!conversionLessFormat(source.format())) {
             // Here we may need to copy if the formats do not match.
             // (e.g. for display modes other than EColor16MAP and EColor16MU)
-            source.ensureFormat(idealFormat(&source.imageRef(), Qt::AutoColor));
+            source.beginDataAccess();
+            QImage::Format format = idealFormat(&source.imageRef(), Qt::AutoColor);
+            source.endDataAccess(true);
+            source.ensureFormat(format);
         }
         recreate = true;
     } else if (type == QPixmapData::VolatileImage && pixmap) {
         QVolatileImage *img = static_cast<QVolatileImage *>(pixmap);
         resize(img->width(), img->height());
         source = *img;
-        source.ensureFormat(idealFormat(&source.imageRef(), Qt::AutoColor));
         recreate = true;
     } else if (type == QPixmapData::NativeImageHandleProvider && pixmap) {
         destroyImages();
@@ -282,8 +284,6 @@ void* QVGPixmapData::toNativeType(NativeType type)
         }
         // Just duplicate the bitmap handle, no data copying happens.
         return source.duplicateNativeImage();
-    } else if (type == QPixmapData::VolatileImage) {
-        return &source;
     }
     return 0;
 }