diff options
Diffstat (limited to 'src/tools/qvkgen/qvkgen.cpp')
| -rw-r--r-- | src/tools/qvkgen/qvkgen.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
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--); } |