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"

When we connect to a signal using QueuedConnection and that signal
carries its context object as argument, then the signal may be
delivered after the object itself was deleted. This happened in the
cmakemanager test for example.

To prevent this, we don't use the QueueudConnection directly but
roll our own based on QTimer::singleShot(0, ...). This allows us
to capture the context object explicitly and then check that before
trying to access it.