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: Add Qt patches #222

Merged
merged 4 commits into from Oct 26, 2023
Merged

deps.qt: Add Qt patches #222

merged 4 commits into from Oct 26, 2023

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Oct 26, 2023

Description

This PR contains four commits:

  1. deps.qt: Restore Patch function for Windows Qt script
    The Patch function was left out of a previous rewrite.

  2. deps.qt: Backport patch for CVE-2023-43114
    The CVE only affects Windows.

    Fixed in 6.5.4 and 6.6.0.

    https://www.qt.io/blog/security-update-regarding-cve-2023-43114
    https://codereview.qt-project.org/c/qt/qtbase/+/504321
    http://bugreports.qt.io/browse/QTBUG-116773

  3. deps.qt: Backport patch for QTBUG-117779

    Fix a bug on Windows where child windows would move with the parent
    window and also resize to their minimum size.

    Fixed in 6.5.4, 6.6.1, and 6.7.

    https://bugreports.qt.io/browse/QTBUG-117779
    https://bugreports.qt.io/browse/QTBUG-118118
    https://bugreports.qt.io/browse/QTBUG-118217

  4. deps.qt: Backport patch for QTBUG-118117

    Fix a bug on Windows that caused taskbar icon overlays to be reset by Qt
    if previously set via native Windows API calls.

    Fixed in 6.5.4, 6.6.1, and 6.7.

    https://bugreports.qt.io/browse/QTBUG-118117

Motivation and Context

Qt 6.5.4 is Commercial LTS only. Don't want these bugs in our release.

How Has This Been Tested?

On Windows 11, I built Qt locally with these patches and built OBS Studio against that version of Qt. I verified that QTBUG-117779 and QTBUG-118117 were no longer present.

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.

The Patch function was left out of a previous rewrite.
Fix a bug on Windows where child windows would move with the parent
window and also resize to their minimum size.

Fixed in 6.5.4, 6.6.1, and 6.7.

https://bugreports.qt.io/browse/QTBUG-117779
https://bugreports.qt.io/browse/QTBUG-118118
https://bugreports.qt.io/browse/QTBUG-118217
Fix a bug on Windows that caused taskbar icon overlays to be reset by Qt
if previously set via native Windows API calls.

Fixed in 6.5.4, 6.6.1, and 6.7.

https://bugreports.qt.io/browse/QTBUG-118117
@RytoEX RytoEX requested a review from PatTheMav October 26, 2023 14:52
@RytoEX RytoEX merged commit fa366cc into obsproject:master Oct 26, 2023
22 checks passed
@RytoEX RytoEX deleted the add-qt-patches branch October 26, 2023 15:54
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.

None yet

2 participants