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"

BUG:432248
FIXED-IN: 5.6.3

Missed out in 73b60f6d
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"

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 4887d28e.

This commit prevented KDevelop from storing CMake Settings changes.

BUG: 431194, 438212
FIXED-IN: 5.6.3

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"

Morten Volden authored Nov 13, 2020 and Pino Toscano committed Feb 10, 2021

Fix test_codecompletion, test_duchain-clang, test_problems and test_files-clang failing on newer Ubuntu

(cherry picked from commit fa83c76b)

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

Timothée Ravier authored Jan 14, 2021 and Friedrich W. H. Kossebau committed Jan 22, 2021

(cherry picked from commit 86697319)

David Redondo authored Nov 03, 2020 and Milian Wolff committed Dec 11, 2020

A style may want to change the surface format of the window. Changing the
surface format after the window has been created has no effect though.
One example of this is Breeze where the context menus created here had an
ugly border instead of the intended look. This is because the setting of
Qt::WA_TranslucentBackground by breeze had no effect anymore after the
window was already created.

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"

When we use the cmake file API we have to run configure to reload the
model. In such a case, when we run configure to apply the new cmake
preferences, we can just run reloadModel directly. Otherwise, we'd
end up running configure twice.

BUG: 429605

We store the cmake build type also in the kdevelo project settings
in order to recreate the build dir on demand if it gets wiped.
But when the user now manually changes it through the cmake cache
value for an existing build dir, the values could get out of sync.
Prevent that by keeping the two values in sync, i.e. once in the
list of cache values and once in the project setting drop down.

BUG: 429605