diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp index 538a59c28f5..fc4a916cb43 100644 --- a/src/gui/vulkan/qvulkaninstance.cpp +++ b/src/gui/vulkan/qvulkaninstance.cpp @@ -428,20 +428,30 @@ QVulkanInstance::~QVulkanInstance() */ /*! + \fn QVulkanInfoVector QVulkanInstance::supportedLayers() const \return the list of supported instance-level layers. \note This function can be called before create(). */ + +/*! + \internal + */ QVulkanInfoVector QVulkanInstance::supportedLayers() { return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedLayers() : QVulkanInfoVector(); } /*! + \fn QVulkanInfoVector QVulkanInstance::supportedExtensions() const \return the list of supported instance-level extensions. \note This function can be called before create(). */ + +/*! + \internal + */ QVulkanInfoVector QVulkanInstance::supportedExtensions() { return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedExtensions() : QVulkanInfoVector(); @@ -464,7 +474,7 @@ QVulkanInfoVector QVulkanInstance::supportedExtensions() \sa setApiVersion() */ -QVersionNumber QVulkanInstance::supportedApiVersion() +QVersionNumber QVulkanInstance::supportedApiVersion() const { return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedApiVersion() : QVersionNumber(); } diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 3e597f9c870..bfdaf1ab691 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -174,9 +174,14 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag) + // ### Qt 7: remove non-const overloads QVulkanInfoVector supportedLayers(); + inline QVulkanInfoVector supportedLayers() const + { return const_cast(this)->supportedLayers(); } QVulkanInfoVector supportedExtensions(); - QVersionNumber supportedApiVersion(); + inline QVulkanInfoVector supportedExtensions() const + { return const_cast(this)->supportedExtensions(); } + QVersionNumber supportedApiVersion() const; void setVkInstance(VkInstance existingVkInstance);