Skip to content
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

Merged
merged 5 commits into from
May 18, 2021
Merged

[C++] Rename Qt5 to Qt #9490

merged 5 commits into from
May 18, 2021

Conversation

wing328
Copy link
Member

@wing328 wing328 commented May 15, 2021

Rename qt5 to qt 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

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    
    Commit all changed files.
    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.
  • File the PR against the correct branch: master, 5.1.x, 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@wing328 wing328 marked this pull request as ready for review May 15, 2021 17:38
@etherealjoy
Copy link
Contributor

LGTM, small nit the cmake file also could be updated to say cpp-qt-client as well

@wing328
Copy link
Member Author

wing328 commented May 17, 2021

@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)

@etherealjoy
Copy link
Contributor

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

@wing328 wing328 merged commit 9e4afb0 into master May 18, 2021
@wing328 wing328 deleted the qt5-rename branch May 18, 2021 15:10
premiumitsolution pushed a commit to premiumitsolution/openapi-generator that referenced this pull request May 26, 2021
* rename qt5 to qt

* rename, update

* rename qt5 to qt in the templates

* update doc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants