GitLab

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"

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"

Break the loop in stat since the first element is "." or the file.

BUG: 449126

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"

It's read-only, trying to copy raises an "unsupported action" error.

All files in here are linked as local files, so opening a file
will actually redirect to the real location and so editing files
works fine without the worker being marked as writable.

Task tracked at:
teams/frameworks-devs/kf6-workboard#2

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"

QFile::rename() changed its implementation in Qt6 apparently and it no
longer produces inotify rename events, which breaks the test there.

As this test is Linux-only anyway, not using QFile shouldn't be a problem
here.

No longer set by default in all cases with Qt6.

In Qt6, QMultiMap no longer inherits QMap

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"

Instead of /usr/include/KF5/baloo_version.h.

For more details see:
kservice!79

GIT_SILENT

Allen Winter authored Dec 27, 2021 and Nate Graham committed Jan 04, 2022

inside the Q_OS_WIN conditional compile the QByteArray filePath
must be converted to a QString for use by QFileInfo.

Instead of setting '.' set 'All Tags'

BUG: 416389

Task: https://phabricator.kde.org/T14337