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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Change the pooled QGLPixmapData to be backed by QVolatileImage.
  Started changes-4.7.4 file
  Changed s60 style not to rely on QPixmapData::toNativeType().
  Add missing bitmap locking to QVGPixmapData::fromNativeType.
  Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 1ff195d..e46c826 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -639,13 +639,14 @@ QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask
 
     QPixmap pixmap;
     QScopedPointer<QPixmapData> pd(QPixmapData::create(0, 0, QPixmapData::PixmapType));
-    bool nativeMaskSupported = (pd->toNativeType(QPixmapData::VolatileImage) != 0);
-    if (mask && nativeMaskSupported) {
-        // Efficient path, less copying and conversion.
+    if (mask) {
+        // Try the efficient path with less copying and conversion.
         QVolatileImage img(icon, mask);
         pd->fromNativeType(&img, QPixmapData::VolatileImage);
-        pixmap = QPixmap(pd.take());
-    } else {
+        if (!pd->isNull())
+            pixmap = QPixmap(pd.take());
+    }
+    if (pixmap.isNull()) {
         // Potentially more expensive path.
         pd->fromNativeType(icon, QPixmapData::FbsBitmap);
         pixmap = QPixmap(pd.take());