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"

A bit sad that the break was added because someone reported that it gave
a warning and noone took the time to read the code and say "no but the
fallthrough here is intentional"

BUGS: 416487
CCBUGS: 385677

This came from kconfiggui implicitly

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 need to make the thememanager return a reference to its list of
themes, this way, takeAt in ThemeModel::removeRows actually removes
the theme from the thememanager too and thus this way there's no attempt
at double delete on shutdown

BUGS: 413278

BUG: 409502

Summary: Some methods are considered deprecated. This patch tries to replace them with non-deprecated ones.

Test Plan:
1. Compiles with no warnings on Qt methods deprecation except for QFontMetrics::width().
2. Run k3b and create some audio project.

Reviewers: #kde_applications, aacid

Reviewed By: #kde_applications, aacid

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

Summary: Minor spelling and grammar fixes found while packaging for debian.

Test Plan: Fixes debian lintian

Reviewers: yurchor

Reviewed By: yurchor

Subscribers: yurchor

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

BUGS: 411969

This fixes compiling on top of taglib in a custom prefix

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"