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"

David Edmundson authored Dec 19, 2021 and Kai Uwe Broulik committed Dec 21, 2021

In an &operator= we already have an object. It will have the d-pointer
already allocated.

If we create a new private implementation our old one leaks


(cherry picked from commit 079552b3)

(cherry picked from commit 1960f105)

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"

GIT_SILENT

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"

The default value for active in the kcfg file inside kwin for colour
correction is false.

As we have a bridge that mirrors the config contents over DBus and
defaults hardcoded in a second format this has got out of sync.

This both leads to the default button being enabled/disabled incorrectly
on a fresh system and not working properly.

More important as geo-location is on by default this leads to http
requests being made without the user's explicit consent. A major bug.

BUG: 442253

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"

A `QSize(0,0)` is still valid... Fixes sometimes preview not showing
and other problems with the thumbnailer.

CCBUG: 430862


(cherry picked from commit 5d81c41e)

This reverts commit 13057013.

That commit set the cursorVisible: propety to true. However that
property only exists in the QtQuickControls 2 TextField, not the QQC1
version. We ported the lock screen to PlasmaComponents3 (which
internally uses QQC2) after Plasma 5.18, meaning that in the LTS
version, we still have a QQC1 TextField so this property does not exist.
Trying to set it causes a runtime error and breaks the lock screen.

BUG: 435233
FIXED-IN: 5.18.7.1

GIT_SILENT

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"

Eike Hein authored Oct 04, 2020 and Nate Graham committed Feb 01, 2021

When computing the delta between the visible and the last saved launcher
order state, following the reordering of launchers, the code was incorrectly
comparing resolved and unresolved (i.e., for config storage) launcher URLs.
This lead to an incorrect result and therefore pinned tasks jumping around
in the Task Manager applet.

BUG:426880


(cherry picked from commit fa00ca6a)

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"

When this was ported to C++, it missed the actual variable assignments.


(cherry picked from commit 76088e21)

David Edmundson authored Jan 08, 2021 and Nate Graham committed Jan 11, 2021

In commit 45e0a722 we changed the focus
on the textfield with the intention of fixing the cusor blinking.

This had the unfortunate side effect of breaking waking out of the
screensaver mode with just the keyboard.

That screensaver mode was bound to:
```
property bool blockUI: mainBlock.mainPasswordBox.text.length > 0
```
for that to change, we need to have focus.

Instead this patches cursor blinking more explicity.

Doing it only in the lock screen (as opposed to the toolkit) makes sense
as this only happens due to somewhat unusual usage inside the
lockscreen.

BUG: 431286


(cherry picked from commit 2cbd7e4c)

David Edmundson authored Jan 07, 2021 and Nate Graham committed Jan 07, 2021

An opacity of 0 but still visible still results in nodes in the
scenegraph, which is wasteful.  This is shown in gammaray with some
warnings.

Enabled is also bound to visible as if a text field has focus it still
animates the cursor icon even if inivisble, producing wakeups.

BUG: 347772
FIXED-IN: 5.21


(cherry picked from commit 45e0a722)

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 Nov 28, 2020 and Nate Graham committed Nov 28, 2020

(cherry picked from commit a36ffb69)

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"

GIT_SILENT

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"

Eugene Popov authored Jun 14, 2020 and Nicolas Fella committed Sep 09, 2020

I noticed that on the first time I bring up the calendar by clicking the clock on my Plasma panel, it always shows 'No event for today'. If I click another day on the calendar and then click back on today, it shows today's events fine. It should display it correctly the first time. To fix this bug, we need to compare the date without time. This patch is the same as the one that fixes BUG 395956, but only for Plasma/5.18 branch.

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"

For SNI icons menu is imported from DBus. If during import it is
changed, for example some actions added or replaced, new actions are
added, but old one are only marked for removal in next event loop run.
As a result menu size is too big until delereLater takes effect.
Queue connection, so that Qt will have a chance to delete menu entires
before menu is used.

BUG: 421275
FIXED-IN: 5.18.6

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"

Notification spec says, when replacing a notification:

> The server must atomically (ie with no flicker or other visual cues) replace the given notification with this one.

Notifications shifting about is a "visual cue".

Differential Revision: https://phabricator.kde.org/D29771

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"