From 848e95025297f8f56443ea7b22a1ddca1cc63cd8 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@digia.com>
Date: Fri, 3 Oct 2014 14:57:29 +0200
Subject: Rename internal enum value to avoid clashing with Xlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4926d1f75ece220d28abf9f2e7081e41f0aaf339
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 src/platformsupport/eglconvenience/qeglplatformintegration.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/platformsupport/eglconvenience')

diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp
index b8205dc575..7d05b54c15 100644
--- a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp
@@ -193,7 +193,7 @@ enum ResourceType {
     EglContext,
     EglConfig,
     NativeDisplay,
-    Display
+    XlibDisplay
 };
 
 static int resourceType(const QByteArray &key)
@@ -236,7 +236,7 @@ void *QEGLPlatformIntegration::nativeResourceForScreen(const QByteArray &resourc
     void *result = 0;
 
     switch (resourceType(resource)) {
-    case Display:
+    case XlibDisplay:
         // Play nice when using the x11 hooks: Be compatible with xcb that allows querying
         // the X Display pointer, which is nothing but our native display.
         result = reinterpret_cast<void*>(nativeDisplay());
-- 
cgit v1.2.3