GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 7fe75351)

Update MainWindow::moveEvent() to correctly handle a result of -1 from
QApplication::desktop()->screenNumber() ("widget is not on any screen"),
which was previously causing a user preference for "show yakuake on a
fixed screen" to revert to "show yakuake on the same screen as the
mouse".

BUG: 445106

(cherry picked from commit 8399af82)

Nicolas Fella authored Apr 26, 2022 and Merge Service committed Apr 26, 2022

It used to be part of KColorScheme, and still is for compatibility

Use the proper location for future-proofing

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit aedafb19)

Martin Seher authored Apr 11, 2022 and Nate Graham committed Apr 11, 2022

QCursor::pos does not work under wayland. So use active output from KWin
to determine startup screen, if not configured otherwise.

BUG: 445158

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Tiernan Hubble authored Feb 28, 2022 and Nate Graham committed Feb 28, 2022

Qt Wayland windows have their internal Wayland surface destroyed when they're
hidden, and re-created when they're shown. Since `KWindowEffects::slideWindow()`
requires the Wayland surface, it doesn't work when called after `hide()` and
before `show()`. The solution is simply to call it directly after `show()`; window
opening animations are asynchronous so the effect is applied to the window as
it's opening.

BUG: 447456
FIXED-IN: 22.04

(cherry picked from commit 812fe9af)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 99aa1781)

GIT_SILENT

GIT_SILENT

(cherry picked from commit afb5c2b6)