diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-06 14:29:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-11 14:07:37 +0200 |
| commit | 1f3ad386b11f84b65f70350099ac629d3cea8c9c (patch) | |
| tree | c457ba6256f9832a7d441efe43479e7274140f4d /src/core/api/qtwebenginecoreglobal.cpp | |
| parent | 58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6 (diff) | |
Switch away from QT_NO_OPENGL
Change-Id: I310265dacc9b1c8d391e82b6adf52b70c037d9b9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/api/qtwebenginecoreglobal.cpp')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index 9e2a4a5b1..ce4362741 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -40,7 +40,7 @@ #include "qtwebenginecoreglobal_p.h" #include <QGuiApplication> -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) # include <QOpenGLContext> #ifdef Q_OS_MACOS #include <sys/types.h> @@ -49,14 +49,14 @@ #endif #include <QThread> -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) QT_BEGIN_NAMESPACE Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context); Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); QT_END_NAMESPACE #endif -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) #ifdef Q_OS_MACOS static bool needsOfflineRendererWorkaround() { @@ -75,7 +75,7 @@ static bool needsOfflineRendererWorkaround() #endif namespace QtWebEngineCore { -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) static QOpenGLContext *shareContext; static void deleteShareContext() @@ -94,7 +94,7 @@ static void deleteShareContext() Q_WEBENGINECORE_PRIVATE_EXPORT void initialize() { -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) #ifdef Q_OS_WIN32 qputenv("QT_D3DCREATE_MULTITHREADED", "1"); #endif @@ -134,6 +134,6 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize() // Classes like QOpenGLWidget check for the attribute app->setAttribute(Qt::AA_ShareOpenGLContexts); -#endif // QT_NO_OPENGL +#endif // QT_CONFIG(opengl) } } // namespace QtWebEngineCore |