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

[Qt5|qmake] pass toolchain setup #26354

Merged
merged 14 commits into from
Sep 12, 2022

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Aug 15, 2022

one todo in #9881

github-actions[bot]
github-actions bot previously approved these changes Aug 15, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 15, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for qt5-base have changed but the version was not updated
version: 5.15.5#2
old SHA: d827eb6115776d5cb8ec0d40205f93398ef669b3
new SHA: 50cd570c43131aa27d07211d7fb9a5e84a0772a9
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Aug 15, 2022
@Cheney-W Cheney-W added category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines labels Aug 16, 2022
@JavierMatosD JavierMatosD added requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. and removed info:reviewed Pull Request changes follow basic guidelines labels Aug 16, 2022
ports/qt5-base/cmake/configure_qt.cmake Outdated Show resolved Hide resolved
scripts/cmake/vcpkg_configure_qmake.cmake Outdated Show resolved Hide resolved
scripts/cmake/vcpkg_configure_qmake.cmake Outdated Show resolved Hide resolved
scripts/cmake/vcpkg_configure_qmake.cmake Outdated Show resolved Hide resolved
scripts/cmake/vcpkg_configure_qmake.cmake Outdated Show resolved Hide resolved
@JavierMatosD JavierMatosD added requires:author-response and removed requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels Sep 1, 2022
Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for qt5-base have changed but the version was not updated
version: 5.15.5#2
old SHA: 50cd570c43131aa27d07211d7fb9a5e84a0772a9
new SHA: c3d14cc7c6b29923bfcdbab8a96b7db2394f7684
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Sep 1, 2022
@Cheney-W
Copy link
Contributor

Cheney-W commented Sep 2, 2022

@JavierMatosD Please review again, thank you!

@Osyotr Osyotr mentioned this pull request Sep 7, 2022
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Sep 8, 2022
…olchain_setup

# Conflicts:
#	ports/qt5-base/vcpkg.json
#	versions/baseline.json
#	versions/q-/qt5-base.json
github-actions[bot]
github-actions bot previously approved these changes Sep 8, 2022
@vicroms vicroms merged commit f2453e0 into microsoft:master Sep 12, 2022
@Neumann-A Neumann-A deleted the qt5_qmake_pass_toolchain_setup branch September 12, 2022 21:30
daschuer added a commit to daschuer/vcpkg that referenced this pull request Jan 19, 2023
The CMake flags have been already collected during configuring Qt5 base and are
stored in qmodule.pri (<installed>\tools\qt5\mkspecs).
The additional flag retrieving is disabled in qt_build_submodule.cmake

This fixes a regression since microsoft#26354
daschuer added a commit to daschuer/vcpkg that referenced this pull request May 2, 2023
The CMake flags have been already collected during configuring Qt5 base and are
stored in qmodule.pri (<installed>\tools\qt5\mkspecs).
The additional flag retrieving is disabled in qt_build_submodule.cmake

This fixes a regression since microsoft#26354
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants