GitLab

If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs

If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs

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"

We do not need to take the extra path to c++
anymore and can just use the QML components.

For the UI reloading an explicit method call got added.

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 AbstractUnitListModel is destroyed everytime we leave Units tab
and when we are going to the Units tab for the second time, qml will
try to access AbstractUnitListModel that is already destroyed.
This causes segmentation fault.

Set AbstractUnitListModel parent to qml engine so that the
AbstractUnitListModel is destroyed when qml engine is
destroyed.

BUG: 419709

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"

Add new page in settings of Timer applet for editing "predefined timers" values. Those values are used in context menu of the applet.

FEATURE: 353091
CCBUG: 301861
CCBUG: 397841
FIXED-IN: 5.21

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"

icon. However, the dataengine does not return a url. Changed the method
headers and method calls to use QIcon instead.

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"

This reverts commit aea6c969.
Need to wait a little bit longer, sorry.

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"

Qt 5.15 introduced new syntax for defining Connections. Fix warnings like this one:
QML Connections: Implicitly defined onFoo properties in Connections are deprecated. Use this syntax instead: function onFoo(<arguments>) { ... }

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"

to know if we're in the systray, use the new containmentType property

They are the same on Linux (but DataLocation is deprecated). On Windows this enables the use of the roaming path.

NO_CHANGELOG

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"

BUG: 428154
FIXED-IN: 5.21

It actually was one of my first KDE patches where I had no idea how the translation system worked ;)

They are about to get deprecated(frameworks/krunner!40)
and the minLetterCount and matchRegex properties are already utilized.