Use a 'packageName' for CombinedModelsAndAPIs and export files
- use the 'packageName' (which is a cmake target) for naming
<*>Export.h, <*>CommonExports.h and <*>CombinedModelsAndAPIs.cpp
files on generation.
- use a 'packageNameUpperCase' instead of the 'prefix' for export
macros names.
The reason of changing is a user can set an empty prefix using
MODEL_NAME_PREFIX command's argument.
It will lead to the bad export naming, like: '_EXPORT'
At the same time the 'packageName' should always be set by the user,
so it is safer to use 'packageName' for export macros
and for CombinedModelsAndAPIs.
Pick-to: 6.11
Change-Id: I1c8ef50267d752e1347d9aeb1f36e6c1352f8504
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
| commit | 29969d0b0921403d924f157fa77fed7e94b83ecb |
| parent | 4b42f900ab1f7dd19021632ec0fc9caa672156b3 |
| author | Tatiana Borisova <tatiana.borisova@qt.io> |
| committer | Tatiana Borisova <tatiana.borisova@qt.io> |
| commit time | Mon, 15 Dec 2025 18:14:39 +0100 |
- M src/openapi/Qt6OpenApiToolsGeneratorMacros.cmake
- M src/tools/qtopenapi-generator/src/main/java/org/qtproject/qt/codegen/CppQt6ClientGenerator.java
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/api-header.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/HttpFileElement.h.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/HttpRequest.h.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/api-base-header.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/common-exports.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/enum-header.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/helpers-header.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/common/object-header.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/exports.mustache
- M src/tools/qtopenapi-generator/src/main/resources/cpp-qt6-client/model-header.mustache