diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-26 00:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-26 00:00:13 (GMT) |
| commit | 7dec702b4ac6fba07640959a0666ab1b44e25f07 (patch) | |
| tree | e640b2e533c69ea9878f63f2aeecce3d604a01a0 /src/gui/image | |
| parent | d8ee9ddffa4e0cad8c1d991ab6fb84b705c075e5 (diff) | |
| parent | ccebbb663a1b21204057d8b799de3ddf1b63307e (diff) | |
| download | Qt-7dec702b4ac6fba07640959a0666ab1b44e25f07.zip Qt-7dec702b4ac6fba07640959a0666ab1b44e25f07.tar.gz Qt-7dec702b4ac6fba07640959a0666ab1b44e25f07.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 0f7872e..c154740 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -256,6 +256,8 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* case QImage::Format_ARGB4444_Premultiplied: cgflags = kCGImageAlphaPremultipliedFirst; break; + default: + break; } #ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version |