From 6d87e3ed40173eac8c275d5926266359d53c74c7 Mon Sep 17 00:00:00 2001 From: Axel Rasmussen Date: Mon, 7 Jul 2014 19:50:12 -0600 Subject: Rename QPixelFormat enum value to avoid conflict with X.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/image/qimage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/image/qimage.cpp') 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, -- cgit v1.2.3