Skip to content

UI: Find Qt WinExtras only in Qt 5#6456

Merged
jp9000 merged 1 commit into
obsproject:masterfrom
RytoEX:fix-ui-qt6-compat
May 12, 2022
Merged

UI: Find Qt WinExtras only in Qt 5#6456
jp9000 merged 1 commit into
obsproject:masterfrom
RytoEX:fix-ui-qt6-compat

Conversation

@RytoEX

@RytoEX RytoEX commented May 11, 2022

Copy link
Copy Markdown
Member

Description

WinExtras does not exist in Qt 6. Only try to find it and link against it if using Qt 5.

Motivation and Context

Maintain compatibility with Qt 5 and Qt 6.

How Has This Been Tested?

Was able to successfully run cmake locally against Qt 5 and Qt 6.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

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.

WinExtras does not exist in Qt 6. Only try to find it and link against
it if using Qt 5.
@RytoEX RytoEX added the kind/bug Categorizes issue or PR as related to a bug. label May 11, 2022
@RytoEX RytoEX added this to the OBS Studio 28.0 milestone May 11, 2022
@RytoEX
RytoEX requested a review from PatTheMav May 11, 2022 19:44
@jp9000
jp9000 merged commit 069f35a into obsproject:master May 12, 2022
@RytoEX
RytoEX deleted the fix-ui-qt6-compat branch May 12, 2022 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Categorizes issue or PR as related to a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants