2 files changed, 14 insertions, 12 deletions
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
index 239dfb8c91..0f68968fd3 100644
--- a/src/tools/qvkgen/CMakeLists.txt
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from qvkgen.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## qvkgen Tool:
@@ -8,14 +9,10 @@ qt_get_tool_target_name(target_name qvkgen)
 qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Qt Vulkan Header Generator"
     INSTALL_DIR "${INSTALL_LIBEXECDIR}"
-    TOOLS_TARGET Gui # special case
+    TOOLS_TARGET Gui
     SOURCES
         qvkgen.cpp
-    PUBLIC_LIBRARIES
-        Qt::Core # special case
+    LIBRARIES
+        Qt::Core
 )
 qt_internal_return_unless_building_tools()
-
-#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
-# _OPTION = "host_build"
diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp
index 98d87be1b5..3ef7aa56f6 100644
--- a/src/tools/qvkgen/qvkgen.cpp
+++ b/src/tools/qvkgen/qvkgen.cpp
@@ -12,7 +12,8 @@
 static const QStringList VERSIONS = {
     QStringLiteral("VK_VERSION_1_0"), // must be the first and always present
     QStringLiteral("VK_VERSION_1_1"),
-    QStringLiteral("VK_VERSION_1_2")
+    QStringLiteral("VK_VERSION_1_2"),
+    QStringLiteral("VK_VERSION_1_3")
 };
 
 class VkSpecParser
@@ -324,9 +325,13 @@ bool genVulkanFunctionsH(const QList<VkSpecParser::Command> &commands,
 "#ifndef QVULKANFUNCTIONS_H\n"
 "#define QVULKANFUNCTIONS_H\n"
 "\n"
+"#if 0\n"
+"#pragma qt_no_master_include\n"
+"#endif\n"
+"\n"
 "#include <QtGui/qtguiglobal.h>\n"
 "\n"
-"#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)\n"
+"#if QT_CONFIG(vulkan) || defined(Q_QDOC)\n"
 "\n"
 "#ifndef VK_NO_PROTOTYPES\n"
 "#define VK_NO_PROTOTYPES\n"
@@ -371,7 +376,7 @@ bool genVulkanFunctionsH(const QList<VkSpecParser::Command> &commands,
 "\n"
 "QT_END_NAMESPACE\n"
 "\n"
-"#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)\n"
+"#endif // QT_CONFIG(vulkan) || defined(Q_QDOC)\n"
 "\n"
 "#endif // QVULKANFUNCTIONS_H\n";
 
@@ -606,7 +611,7 @@ int main(int argc, char **argv)
         QStringLiteral("vkGetInstanceProcAddr"),
         QStringLiteral("vkEnumerateInstanceVersion")
     };
-    for (int i = 0; i < commands.count(); ++i) {
+    for (int i = 0; i < commands.size(); ++i) {
         if (ignoredFuncs.contains(commands[i].cmd.name))
             commands.remove(i--);
     }