-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[C++] Rename Qt5 to Qt #9490
[C++] Rename Qt5 to Qt #9490
Conversation
LGTM, small nit the cmake file also could be updated to say cpp-qt-client as well |
@etherealjoy pushed another commit to rename qt5 to qt in the templates. $ grep -R -i qt5 modules/openapi-generator/src/main/resources/cpp-qt-*
modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache:14:find_package(Qt5Core REQUIRED)
modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache:15:find_package(Qt5Network REQUIRED){{#contentCompression}}
modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache:35:target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Network {{#contentCompression}} ${ZLIB_LIBRARIES}{{/contentCompression}})
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/src-CMakeLists.txt.mustache:20:find_package(Qt5Core REQUIRED)
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/src-CMakeLists.txt.mustache:21:find_package(Qt5Network REQUIRED)
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/src-CMakeLists.txt.mustache:31: ${Qt5Core_INCLUDE_DIRS}
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/src-CMakeLists.txt.mustache:32: ${Qt5Network_INCLUDE_DIRS}
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/src-CMakeLists.txt.mustache:44:target_link_libraries(${PROJECT_NAME} Qt5Core Qt5Network ssl crypto qhttpengine)
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/Dockerfile.mustache:7: qt5-qtbase-dev \
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/Dockerfile.mustache:8: qt5-qttools-dev
modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server/Dockerfile.mustache:22: qt5-qtbase \ Now the templates have the above references to qt5 and I think these are valid (library names, etc) |
For now those are valid, in the future we can improve if there is a version agnostic cmake package |
* rename qt5 to qt * rename, update * rename qt5 to qt in the templates * update doc
Rename
qt5
toqt
in the code, samples, configs and more (for both client and server generators)cc @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @MartinDelille (2018/03) @muttleyxd (2019/08)
PR checklist
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*
.For Windows users, please run the script in Git BASH.
master
,5.1.x
,6.0.x