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:
  Wrong QGraphicsItem::childrenBoundingRect() when applying effects.
  Fix a bug in QDirectFBPixmapData::fromImage
  Replace memmove with memcpy
  Fixed compilation of QtOpenGL.
  Optimize initialization of QStaticText

2 files changed, 11 insertions, 16 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 80366d1..f704432 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -91,6 +91,7 @@ void QDirectFBPixmapData::resize(int width, int height)
     setSerialNumber(++global_ser_no);
 }
 
+#ifdef QT_DIRECTFB_OPAQUE_DETECTION
 // mostly duplicated from qimage.cpp (QImageData::checkForAlphaPixels)
 static bool checkForAlphaPixels(const QImage &img)
 {
@@ -160,12 +161,16 @@ static bool checkForAlphaPixels(const QImage &img)
 
     return false;
 }
+#endif // QT_DIRECTFB_OPAQUE_DETECTION
 
-bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img)
+bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img, Qt::ImageConversionFlags flags)
 {
-#ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION
-    return checkForAlphaPixels(img);
+    if (img.depth() == 1)
+        return true;
+#ifdef QT_DIRECTFB_OPAQUE_DETECTION
+    return ((flags & Qt::NoOpaqueDetection) ? img.hasAlphaChannel() : checkForAlphaPixels(img));
 #else
+    Q_UNUSED(flags);
     return img.hasAlphaChannel();
 #endif
 }
@@ -287,19 +292,9 @@ bool QDirectFBPixmapData::fromDataBufferDescription(const DFBDataBufferDescripti
 
 #endif
 
-void QDirectFBPixmapData::fromImage(const QImage &img,
-                                    Qt::ImageConversionFlags flags)
+void QDirectFBPixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags)
 {
-    if (img.depth() == 1) {
-        alpha = true;
-#ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION
-    } else if (flags & Qt::NoOpaqueDetection || QDirectFBPixmapData::hasAlphaChannel(img)) {
-        alpha = true;
-#else
-    } else if (img.hasAlphaChannel()) {
-        alpha = true;
-#endif
-    }
+    alpha = QDirectFBPixmapData::hasAlphaChannel(img, flags);
     imageFormat = alpha ? screen->alphaPixmapFormat() : screen->pixelFormat();
     QImage image;
     if ((flags & ~Qt::NoOpaqueDetection) != Qt::AutoColor) {
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index da6edc6..343b26e 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -86,8 +86,8 @@ public:
     virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); }
 
     inline QImage::Format pixelFormat() const { return imageFormat; }
-    static bool hasAlphaChannel(const QImage &img);
     inline bool hasAlphaChannel() const { return alpha; }
+    static bool hasAlphaChannel(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor);
 private:
 #ifdef QT_DIRECTFB_IMAGEPROVIDER
     bool fromDataBufferDescription(const DFBDataBufferDescription &dataBuffer);