Changeset 846 for trunk/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h (modified) (2 diffs)

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -87 +87 @@
 
     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