diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-04-10 10:36:50 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-04-12 09:39:35 +0000 |
| commit | e173cb17d97aa3c2065189275c85db79eb7d1748 (patch) | |
| tree | c5878a000586a49292340f566a704c16339c041b | |
| parent | 7c379772b23503a23dae8985bb2473952046931d (diff) | |
Do not initialize static bindings in x11_initializerv5.11.0-beta4
We still do not use ozone for glx or wayland if
webengine compiled with x11 support. X11 initializer
tries to load egl libraries, this will be
reimplemented with lazy binding in core.
Task-number: QTBUG-65682
Change-Id: I47012f487652e750f223b086e7ca4b224340cc22
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/ui/gl/init/gl_initializer_x11.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/ui/gl/init/gl_initializer_x11.cc b/chromium/ui/gl/init/gl_initializer_x11.cc index 4bf9085a120..05f6aaec185 100644 --- a/chromium/ui/gl/init/gl_initializer_x11.cc +++ b/chromium/ui/gl/init/gl_initializer_x11.cc @@ -176,7 +176,6 @@ bool InitializeGLOneOffPlatform() { return true; } } -#endif bool InitializeStaticGLBindings(GLImplementation implementation) { // Prevent reinitialization with a different implementation. Once the gpu @@ -209,6 +208,7 @@ bool InitializeStaticGLBindings(GLImplementation implementation) { return false; } +#endif // !defined(TOOLKIT_QT) void InitializeDebugGLBindings() { InitializeDebugGLBindingsEGL(); |