diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
| commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
| tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /src/core/web_engine_context.cpp | |
| parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
| parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index aba23b622..410e13837 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -170,7 +170,7 @@ bool usingSoftwareDynamicGL() { if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) return true; -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(QT_NO_OPENGL) HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle()); wchar_t path[MAX_PATH]; DWORD size = GetModuleFileName(handle, path, MAX_PATH); |