summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-10 10:28:28 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-10 10:28:28 +0100
commit95621e44c4234872aaa827885c5ffedee4e73807 (patch)
tree83a82619c1e729b65ada1782d487329cd3645dd4 /src/core
parent9748862ee843b371b795fbf5b1a5b476e30ed402 (diff)
parent2d641398008ce8d58bb257f32e10914cd564405e (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Diffstat (limited to 'src/core')
-rw-r--r--src/core/web_engine_context.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index b4788e02d..78c0fa3b8 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -133,6 +133,8 @@ bool usingANGLE()
bool usingSoftwareDynamicGL()
{
+ if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL))
+ return true;
#if defined(Q_OS_WIN)
HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
wchar_t path[MAX_PATH];