diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-05-06 17:37:09 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-06 18:03:29 +0200 |
commit | cb74d88037aa4949f1c1a9ec8bd83b15b01b2dea (patch) | |
tree | 07138aeade84bf64b0c4a443ebaec044ac1ebeb6 /src | |
parent | edb725c8038df18928541094e7fd6a4a278cca92 (diff) |
Set Chromium to EGL on eglfs too
Don't try to use GLX on regular Linux builds when using eglfs.
Change-Id: I491ab4931e3e26869069680aff6aaab499c61986
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/web_engine_context.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index e6c9f70cf..95bdce817 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -160,7 +160,8 @@ WebEngineContext::WebEngineContext() GLContextHelper::initialize(); // Tell Chromium to use EGL instead of GLX if the Qt xcb plugin also does. - if (qApp->platformName() == QStringLiteral("xcb") && qApp->platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("egldisplay"), 0)) + if ((qApp->platformName() == QStringLiteral("xcb") || qApp->platformName() == QStringLiteral("eglfs")) + && qApp->platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("egldisplay"), 0)) parsedCommandLine->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationEGLName); content::UtilityProcessHost::RegisterUtilityMainThreadFactory(content::CreateInProcessUtilityThread); |