Skip to content

UI: Qt 6 deprecations#6770

Merged
RytoEX merged 3 commits into
obsproject:masterfrom
sebastian-s-beckmann:qt-6-deprecations
Jul 22, 2022
Merged

UI: Qt 6 deprecations#6770
RytoEX merged 3 commits into
obsproject:masterfrom
sebastian-s-beckmann:qt-6-deprecations

Conversation

@sebastian-s-beckmann

@sebastian-s-beckmann sebastian-s-beckmann commented Jul 19, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Description

Fixes deprecations for Qt.

Motivation and Context

Less deprecations.

How Has This Been Tested?

First commit:

  • Undo/Redo hotkeys still work
  • Moving items in the preview with arrow keys still works (with shift as well)

Second commit:

  • Context Bar Media Slider (MediaSlider)
  • Quick Transitions Button (MenuButton)
  • Drag and Drop in Sources Dock and Scenes Dock (SourceTree and SceneTree)
  • Interact Menu on Browser Source, with pointerpointer.com and webgl aquarium (OBSBasicInteraction)
  • In preview, moving the mouse over items correctly highlights the item where the mouse is. When dragging a selection, that selection is in the correct place
  • In multiview, clicking a scene correctly selects it for the preview. With "Transition to scene when double-clicked" enabled, double clicking a scene selects and transitions to it.

Third commit:

  • Raised a sample information, warning, and critical message box
  • Raised several question dialogs in OBS, like closing the properties window without saving or selecting lossless mode, and made sure the buttons have the intended effect.

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.

@sebastian-s-beckmann sebastian-s-beckmann added the kind/cleanup Non-breaking change which makes code smaller or more readable label Jul 19, 2022
@RytoEX RytoEX self-assigned this Jul 19, 2022
RytoEX
RytoEX requested changes Jul 19, 2022
View reviewed changes

@RytoEX RytoEX left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Did a quick visual review.

Comment thread UI/window-basic-preview.cpp Outdated
@sebastian-s-beckmann sebastian-s-beckmann mentioned this pull request Jul 21, 2022
Closed
6 tasks
@tytan652 tytan652 mentioned this pull request Jul 21, 2022
Merged
6 tasks
@tytan652

tytan652 commented Jul 21, 2022 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Build against #6759 with Qt6 and got those lines as errors:

Otherwise once fixed it builds fine.

@sebastian-s-beckmann sebastian-s-beckmann changed the title UI: Qt 6 deprecations, Part 1 UI: Qt 6 deprecations Jul 21, 2022
@sebastian-s-beckmann

sebastian-s-beckmann commented Jul 21, 2022

Copy link
Copy Markdown
Member Author

@tytan652 should be fixed, feel free to re-test

@tytan652

tytan652 commented Jul 21, 2022 •
edited
Loading

Copy link
Copy Markdown
Collaborator

I confirm that this PR as it is builds against #6759 with no errors and without any fix.

RytoEX
RytoEX approved these changes Jul 22, 2022
View reviewed changes

@RytoEX RytoEX left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

All my tests in Qt 6.3.0-git (close to 6.3.1) worked fine. I think @gxalpha had tested this in Qt5 for good measure, and CI is still building against as well, so at minimum we know it builds without warnings/errors.

@RytoEX

RytoEX commented Jul 22, 2022

Copy link
Copy Markdown
Member

Ran through the same tests I did yesterday, but with Qt 5.15.2. Everything seemed to work fine.

@RytoEX
RytoEX merged commit e3f416f into obsproject:master Jul 22, 2022
@RytoEX RytoEX added this to the OBS Studio 28.0 milestone Jul 22, 2022
@sebastian-s-beckmann
sebastian-s-beckmann deleted the qt-6-deprecations branch July 22, 2022 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RytoEX RytoEX RytoEX approved these changes

Assignees

@RytoEX RytoEX

Labels

kind/cleanup Non-breaking change which makes code smaller or more readable

Projects

None yet

Milestone

OBS Studio 28.0

Development

Successfully merging this pull request may close these issues.

3 participants

@sebastian-s-beckmann @tytan652 @RytoEX