diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:14:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:14:49 +0200 |
| commit | 53df50a08fa68e85afea5ed02326eb8616fa1ee9 (patch) | |
| tree | 3b0302d7c1ef0929992192db9effc2c1c6f119c2 /src/core | |
| parent | d4ef262a9e84f73c7bd211c843b8094eb4863a17 (diff) | |
| parent | 6426f1e93622cb08a2286705398e7762cbcd0a45 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Idee34fa6d4cc54effd84d3b78e3666fa7fcce8db
Diffstat (limited to 'src/core')
| -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 62d62119a..48e5bc438 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -186,7 +186,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); |