diff options
| author | Axel Rasmussen <axel.rasmussen1@gmail.com> | 2014-07-07 19:50:12 -0600 |
|---|---|---|
| committer | Axel Rasmussen <axel.rasmussen1@gmail.com> | 2014-07-14 23:03:18 +0200 |
| commit | 6d87e3ed40173eac8c275d5926266359d53c74c7 (patch) | |
| tree | 70030ce65657dbfd163f17e562de38902f4589e2 /src/gui/image | |
| parent | 8e69a039216459d8a09d344b24b91d0e4f0585d2 (diff) | |
Rename QPixelFormat enum value to avoid conflict with X.h.
This commit fixes a potential compile error where pixelformat.h would
not compile if X.h from x11proto was included first, since X.h #define's
GrayScale as an integer constant.
Task-number: QTBUG-40087
Change-Id: I7208a204259c6d3a13b5d0cbc98a76bb54b8b494
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index d8c3a8c2eb..c48924e2fd 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4603,7 +4603,7 @@ static const QPixelFormat pixelformats[] = { //QImage::Format_Invalid: QPixelFormat(), //QImage::Format_Mono: - QPixelFormat(QPixelFormat::GrayScale, + QPixelFormat(QPixelFormat::Grayscale, /*RED*/ 1, /*GREEN*/ 0, /*BLUE*/ 0, @@ -4616,7 +4616,7 @@ static const QPixelFormat pixelformats[] = { /*INTERPRETATION*/ QPixelFormat::UnsignedByte, /*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian), //QImage::Format_MonoLSB: - QPixelFormat(QPixelFormat::GrayScale, + QPixelFormat(QPixelFormat::Grayscale, /*RED*/ 1, /*GREEN*/ 0, /*BLUE*/ 0, |