diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-03 14:57:29 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-05 22:51:43 +0200 |
commit | 848e95025297f8f56443ea7b22a1ddca1cc63cd8 (patch) | |
tree | 87b0f4deaa6fd934f335f34ab8e641d06c3e7d34 | |
parent | 014ed987ac3e496a6dac540a6b569e9fa73cd719 (diff) |
Rename internal enum value to avoid clashing with Xlib
Change-Id: I4926d1f75ece220d28abf9f2e7081e41f0aaf339
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | src/platformsupport/eglconvenience/qeglplatformintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |