diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-02-28 16:12:45 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-04 11:29:54 (GMT) |
| commit | 7b4e032559c7b226280e5c9229cd685e73d1e707 (patch) | |
| tree | 1edcb33e0002eab478bcf5c7e8d20abfd51b5e97 /src/corelib | |
| parent | 2e80c16854c97aafff229828a5dbf4b0e31d245f (diff) | |
| download | Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.zip Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.tar.gz Qt-7b4e032559c7b226280e5c9229cd685e73d1e707.tar.bz2 | |
Added image conversion flag to prevent conversions.
This is needed in the meego graphics system to support the shared image
fallback path (when using the raster graphicssystem). The flag is
internal.
Reviewed-by: Gunnar Sletta
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index e492345..6fa3360 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -574,7 +574,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 8440542..89e6f55 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -732,6 +732,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 |