summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/gl_surface_qt.cpp3
-rw-r--r--src/core/web_engine_context.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 86bb4fda9..7596fcaff 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -171,9 +171,6 @@ bool GLSurfaceQtGLX::InitializeOneOff()
if (initialized)
return true;
- // http://crbug.com/245466
- qputenv("force_s3tc_enable", "true");
-
XInitThreads();
g_display = GLContextHelper::getXDisplay();
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 8845cedbe..9a96f695e 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -209,6 +209,12 @@ WebEngineContext::WebEngineContext()
useEmbeddedSwitches = !appArgs.removeAll(QStringLiteral("--disable-embedded-switches"));
#endif
+#ifdef Q_OS_LINUX
+ // Call qputenv before BrowserMainRunnerImpl::Initialize is called.
+ // http://crbug.com/245466
+ qputenv("force_s3tc_enable", "true");
+#endif
+
#if defined(Q_OS_WIN)
// We must initialize the command line with the UTF-16 arguments vector we got from
// QCoreApplication. CommandLine::Init ignores its arguments on Windows and calls