Separate a 'prefix' for common files and a 'modelNamePrefix'
- the prefixes were mixed up together.
But the 'modelNamePrefix' should NOT be connected somehow with common
library files. The 'modelNamePrefix' should affect only names of
a client library.
But for common files we should have a separate option. So,
I add the 'prefix' option to the 'additional-properties'
to split a prefixes.
- Rename MODEL_NAME_PREFIX to CLIENT_PREFIX, because
it is responsible for client files.
Note: it's always was responsible for Api in our implementation,
I'd prefer to save it.
- the 'prefix' option related to common files is always constant
in our cmake function. The reason is Qt library files are
pre-generated and their names can not change from generation
to generation.
Note: users can change 'prefix' option manually from the command
interface.
- Set the modelNamePrefix empty for all models by default,
as discussed.
We don't want to use any Qt related signature for them, they are not
a part of Qt classes.
Task-number: QTBUG-142395
Pick-to: 6.11
Change-Id: Ic8c043db9b747f61e1a19c1ae564ba86a079833a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
| commit | 5dd7b2617bfa07011188b89971ae24b2487612e4 |
| parent | 29969d0b0921403d924f157fa77fed7e94b83ecb |
| author | Tatiana Borisova <tatiana.borisova@qt.io> |
| committer | Tatiana Borisova <tatiana.borisova@qt.io> |
| commit time | Mon, 15 Dec 2025 18:14:45 +0100 |
- M examples/openapi/colorpalette/ApiBridges.h
- M examples/openapi/colorpalette/main.cpp
- M src/openapi/Qt6OpenApiToolsGeneratorMacros.cmake
- M src/tools/qtopenapi-generator/src/main/java/org/qtproject/qt/codegen/CppQt6AbstractCodegen.java
- 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 tests/auto/cmake/RunCMake/LibraryInstallation/src/tst_compression.cpp
- M tests/auto/compression/client/tst_compression/tst_compression.cpp
- M tests/auto/linking_several_clients/application/TestConfiguration1.cpp
- M tests/auto/mediatype/client/mediatype/MediaType.cpp
- M tests/auto/openapi2.0/client/openapi2.0/OperationParametersBackport.cpp
- M tests/auto/operation-parameters/client/OperationParameters/OperationParameters.cpp
- M tests/auto/petstore/client/PetApiTest/PetApiTests.cpp
- M tests/auto/petstore/client/StoreApiTest/StoreApiTests.cpp
- M tests/auto/petstore/client/UserApiTest/UserApiTests.cpp
- M tests/auto/responses/client/Responses/Responses.cpp
- M tests/auto/server_configuration/client/tst_server_configuration/tst_server_configuration.cpp