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

deps.qt: Update Qt build options #249

Merged
merged 3 commits into from
May 3, 2024

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented May 3, 2024

Description

Update Qt build options:

  • correct OpenSSL configure option
  • disable testlib on macOS
  • do not use vcpkg

While vcpkg is not currently installed on the GitHub macOS runners, vcpkg is available on macOS in general, so I've disabled it in both Windows and macOS scripts in case vcpkg is ever present.

Motivation and Context

Want to have correct and consistent Qt configure options.

How Has This Been Tested?

Checked the configure results locally and on my fork's CI. I haven't done a full build with these options, but the configuration succeeded.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

RytoEX added 3 commits May 2, 2024 22:55
After checking the Qt docs, it seems that some of the options we
attempted to set were being set incorrectly.

https://github.com/qt/qtbase/blob/v6.6.3/cmake/configure-cmake-mapping.md
This was already disabled on Windows.
This is normally autodetected, but we can explicitly enable or disable
it. To prevent unwanted surprises, it's probably safer to disable it.
@RytoEX RytoEX requested a review from PatTheMav May 3, 2024 03:09
@RytoEX RytoEX self-assigned this May 3, 2024
@RytoEX RytoEX merged commit 0b64b22 into obsproject:master May 3, 2024
21 checks passed
@RytoEX RytoEX deleted the update-qt-build-options branch May 3, 2024 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants