diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-10-21 09:12:12 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-10-21 14:25:13 +0300 |
| commit | f39934505df9b6138bbcffebd6abb1d10ec37713 (patch) | |
| tree | 00f769b6e87b6fbd95615aa01a0509166ebdc304 | |
| parent | 1c221938cd1e16c8621cc0bb2d3fe6c786dcf289 (diff) | |
| download | qtapplicationmanager-f39934505df9b6138bbcffebd6abb1d10ec37713.tar.gz | |
Fix build without opengl
After qtbase commit 8539e641f6f48a605547f66c47266d19e537f74e,
opengl headers are not available if the feature is disabled.
Change-Id: Ib5f30f67b83a07f98053c8afdea4125d215558b6
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | src/main-lib/main.cpp | 1 | ||||
| -rw-r--r-- | src/shared-main-lib/sharedmain.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index 86468bf3..0ee799b2 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -37,7 +37,6 @@ #include <QQuickView> #include <QQuickItem> #include <QInputDevice> -#include <private/qopenglcontext_p.h> #include <QLocalServer> #include "global.h" diff --git a/src/shared-main-lib/sharedmain.cpp b/src/shared-main-lib/sharedmain.cpp index d87857e9..bc64c1cf 100644 --- a/src/shared-main-lib/sharedmain.cpp +++ b/src/shared-main-lib/sharedmain.cpp @@ -20,7 +20,9 @@ #include <QtCore/private/qcoreapplication_p.h> #include <QGuiApplication> #include <QIcon> -#include <private/qopenglcontext_p.h> +#if !defined(QT_NO_OPENGL) +# include <private/qopenglcontext_p.h> +#endif #include <private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> |