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"

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"

This adds a more descriptive appstream summary so that users browsing Discover know from a glance what it does, making it more attractive for download.

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"

Summary:
m_shortInputCounter is initialized in RSITimer::suggestBreak only.
Non-null m_shortInputCounter is needed in RSITimer::timeout in case of
TimerState::Resting.
In no pop-up mode RSIBreak goes to RSITimer::timeout omitting
RSITimer::suggestBreak which results in trying to tick uninitialized
m_shortInputCounter.
This patch makes sure that m_shortInputCounter is always initialized.

Reviewers: aacid, pino

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

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"

Proper way to get an icon from the global icon theme, as QIcon.

The proper porting away from SmallIcon() is to use proper icons, not to
set pixmaps again. Revert it as a whole, so it can be fixed properly
from a cleaner state than the copy&paste of QStyle API.

Furthermore, this adds the unconditional hiding of any (including
future ones) deprecated functions in Qt, which is a big no-no.

This reverts commit 7bb92be7.

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"

Summary:
qWarning already adds a newline at end. endl was deprecated with
Qt 5.15.

Test Plan: Builds

Reviewers: aacid

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

Summary:
QPainterPath is no longer included via qtransform.h (since
5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).

Depends on D28255.

Test Plan: Builds fine against 5.15.0-beta2 where it previously didn't

Reviewers: aacid

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