diff options
Diffstat (limited to 'src/platformsupport/vkconvenience')
4 files changed, 69 insertions, 1 deletions
diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt new file mode 100644 index 0000000000..6f17cfa306 --- /dev/null +++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from vkconvenience.pro. + +##################################################################### +## VulkanSupport Module: +##################################################################### + +qt_add_module(VulkanSupport + STATIC + INTERNAL_MODULE + SOURCES + qbasicvulkanplatforminstance.cpp qbasicvulkanplatforminstance_p.h + qvkconvenience.cpp qvkconvenience_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" +) + +#### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>: +# MODULE = "vulkan_support" + +## Scopes: +##################################################################### + +qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt new file mode 100644 index 0000000000..6ec2574375 --- /dev/null +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from vkconvenience.pro. + +qt_find_package(Vulkan) # special case + +##################################################################### +## VulkanSupport Module: +##################################################################### + +qt_add_module(VulkanSupport + STATIC + INTERNAL_MODULE + SOURCES + qbasicvulkanplatforminstance.cpp qbasicvulkanplatforminstance_p.h + qvkconvenience.cpp qvkconvenience_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" +) + +#### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>: +# MODULE = "vulkan_support" + +## Scopes: +##################################################################### + +qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) 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 |