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>
This commit is contained in:
parent
014ed987ac
commit
848e950252
@ -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());
|
||||
|
Loading…
x
Reference in New Issue
Block a user