diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-12-12 08:51:20 +0100 |
---|---|---|
committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-24 08:57:38 +0100 |
commit | 2344e5cc3104b7d599f4d2a96bbfd8530223a08e (patch) | |
tree | 02fae8469ce67262c21c187825c370627e62991d /src/platformsupport | |
parent | 85e3e88e1e68d9834346593c6b4819694f8a1a59 (diff) |
Move QOpenGLTexture and related classes from QtGui to QtOpenGL
Task-number: QTBUG-74409
Change-Id: Ied825dd7cb92365505a4aa43fd67488024160341
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/vkconvenience/qvkconvenience.cpp | 4 | ||||
-rw-r--r-- | src/platformsupport/vkconvenience/vkconvenience.pro | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/platformsupport/vkconvenience/qvkconvenience.cpp b/src/platformsupport/vkconvenience/qvkconvenience.cpp index acde1d1bda..59de335333 100644 --- a/src/platformsupport/vkconvenience/qvkconvenience.cpp +++ b/src/platformsupport/vkconvenience/qvkconvenience.cpp @@ -39,7 +39,9 @@ #include "qvkconvenience_p.h" -#include <QOpenGLTexture> +#if QT_CONFIG(opengl) +#include <QtOpenGL/QOpenGLTexture> +#endif QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/vkconvenience/vkconvenience.pro b/src/platformsupport/vkconvenience/vkconvenience.pro index ee540024cf..f3ada5768a 100644 --- a/src/platformsupport/vkconvenience/vkconvenience.pro +++ b/src/platformsupport/vkconvenience/vkconvenience.pro @@ -2,6 +2,8 @@ TARGET = QtVulkanSupport MODULE = vulkan_support QT = core-private gui-private +qtConfig(opengl): QT += opengl + CONFIG += static internal_module DEFINES += QT_NO_CAST_FROM_ASCII |