diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-10-11 12:36:38 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-09 17:07:28 +0000 |
commit | c1799923be3fb6d68391d5d4729c2d542424a734 (patch) | |
tree | c200ba298e987aff0cf9d7dabdda20a4a8122600 /src/core/gl_context_qt.cpp | |
parent | dd80dd0e4efcdfcc33f71a4f964aa9d2d40c4af0 (diff) |
Make Linux QPA combinations more robust
Use resourceForIntegration to get egldisplay since not all QPA return a
egldisplay for context (in particular xcb_egl).
Implement EGL fallback for linux desktop builds, to make Wayland work
without an X11 server present.
Change-Id: Idcead42250fa00a36e50c082711f5618fd213556
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/gl_context_qt.cpp')
-rw-r--r-- | src/core/gl_context_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp index 0cf873631..b7d82e77a 100644 --- a/src/core/gl_context_qt.cpp +++ b/src/core/gl_context_qt.cpp @@ -118,7 +118,7 @@ void* GLContextHelper::getXConfig() void* GLContextHelper::getEGLDisplay() { - return resourceForContext(QByteArrayLiteral("egldisplay")); + return resourceForIntegration(QByteArrayLiteral("egldisplay")); } void* GLContextHelper::getXDisplay() |