From 96d6bff54942be11458801edc5c59e2cf646253c Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Fri, 26 Mar 2010 11:08:12 -0700
Subject: QDirectFBPixmap can handle NoOpaqueDetection.

We don't need to do the conversion using QImage when NoOpaqueDetection
is specified.

Reviewed-by: muthu <qt-info@nokia.com>
---
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 4219f6f..f2fd699 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -307,7 +307,7 @@ void QDirectFBPixmapData::fromImage(const QImage &img,
         imageFormat = screen->pixelFormat();
     }
     QImage image;
-    if (flags != Qt::AutoColor) {
+    if ((flags & ~Qt::NoOpaqueDetection) != Qt::AutoColor) {
         image = img.convertToFormat(imageFormat, flags);
         flags = Qt::AutoColor;
     } else if (img.format() == QImage::Format_RGB32) {
-- 
cgit v0.12