diff options
| author | Martin Storsjö <martin@martin.st> | 2022-09-29 10:39:07 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2022-09-29 17:18:55 +0300 |
| commit | 11be4c5ce801c870081387e40dfbd813e299f34d (patch) | |
| tree | 25a3fa8760614a310f086e840043e02f3be2862e /src/plugins | |
| parent | 42b66bd809f0cadf232cd8527746b55cd00d9f10 (diff) | |
Fix building with disabled OpenGL after switching to the syncqt tool
After switching qtbase to use the syncqt tool (in
b89d63515bb352cecfd87e709320a2db5b6a1906), these OpenGL specific
headers aren't available at all, when the build is configured
to not use OpenGL.
In one case, add a missing check for QT_NO_OPENGL, and in another
case, include the necessary <QtGui/qtgui-config.h> header to
make the potential QT_NO_OPENGL define available, to make a
preexisting ifdef actually do what it was meant to do.
Change-Id: Ie12deff2eee8e3b59193175551fbb28b7480f1f8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsopengltester.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 265ef719a6..4391208374 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -10,7 +10,9 @@ #include <qpa/qplatformintegration.h> #include <QtCore/qscopedpointer.h> #include <QtGui/private/qwindowsfontdatabase_p.h> +#ifndef QT_NO_OPENGL #include <QtGui/private/qopenglcontext_p.h> +#endif #include <qpa/qplatformopenglcontext.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp index 19b60a4542..6a790bcc1b 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.cpp +++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp @@ -15,6 +15,7 @@ #include <QtCore/qlibraryinfo.h> #include <QtCore/qhash.h> #include <private/qsystemlibrary_p.h> +#include <QtGui/qtgui-config.h> #ifndef QT_NO_OPENGL #include <private/qopengl_p.h> |