Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
  PinchArea example produced incorrect scaling.
  Added image conversion flag to prevent conversions.
  Fix TextInput auto test failure on mac.
  Fix word selection locking on string boundaries.
  Fix potential crash in QTextControl.
  QDeclarativePropertyMap::keys() cannot be called from qml
  Compensate for horizontal scroll in TextInput micro focus.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index d84da0d..afbaa27 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -578,7 +578,8 @@ public:
         PreferDither            = 0x00000040,
         AvoidDither             = 0x00000080,
 
-        NoOpaqueDetection       = 0x00000100
+        NoOpaqueDetection       = 0x00000100,
+        NoFormatConversion      = 0x00000200
     };
     Q_DECLARE_FLAGS(ImageConversionFlags, ImageConversionFlag)
 
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index cbdf9d1..f98ea4a 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -743,6 +743,10 @@
            until a non-opaque pixel is found, or if you want the pixmap to
            retain an alpha channel for some other reason. If the image has no
            alpha channel this flag has no effect.
+
+    \omitvalue NoFormatConversion Don't do any format conversions on the image.
+           Can be useful when converting a QImage to a QPixmap for a one-time
+           rendering operation for example.
 */
 
 /*! \enum Qt::GUIStyle