Fix no-opengl builds on windows

Allan Sandfeld Jensen · Allan Sandfeld Jensen · commit 6426f1e93622 · 2018-09-04T19:12:04.000Z
Change-Id: I134876aa68bd42356c0b897a5d7d5881f27724a4
Reviewed-by: Michal Klocek &lt;michal.klocek@qt.io&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ bool usingSoftwareDynamicGL()`
`186`	`186`	`{`
`187`	`187`	`if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL))`
`188`	`188`	`return true;`
`189`		`-#if defined(Q_OS_WIN)`
	`189`	`+#if defined(Q_OS_WIN) && !defined(QT_NO_OPENGL)`
`190`	`190`	`HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());`
`191`	`191`	`wchar_t path[MAX_PATH];`
`192`	`192`	`DWORD size = GetModuleFileName(handle, path, MAX_PATH);`