GitLab

Some places rely on this being properly set due to using qobject_cast
for quick cross-casting.

BUG: 410820
FIXED-IN: 5.4.1

There are expand-all and collapse-all icons so use them.

https://commits.kde.org/kconfig/5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22

Using the pick-session desktop file here, as this keeps the user in
control what session will be started or allows to create a new.
The plain desktop file loading randomly the last used session loaded,
which also could be heavy on resources, might not be wanted at least
by people with many sessions.

The company name was changed in craft in 2de26ec4179a18f377736b633f1be7c85ca4a8ee

Otherwise the Combobox is to small. If we call initialize() directly instead of
through a QueuedConnection AdjustToContentsOnFirstShow works if the Toolview was
closed on start. However if you restart kdevelop while the toolview is open
the combobox will be to small, too. So just use use AdjustToContents.

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"

As this is a destructive operation, this should be made more clear
in the UI. Also consistent with similar places in kdevelop UI.

(testing fix post-pushing on CI)

(cherry picked from commit 28e4e320)

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"

(cherry picked from commit daad5d3e)

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"

The aim is to decide properly when the currently shown tooltip needs to be updated and when it doesn't, based on the problems and declaration that are currently being displayed in the tooltip (stored in m_currentToolTipProblems and m_currentToolTipDeclaration), and the new problems and declaration that are under the cursor now (in problems and decl).

Old line 612: The old version always keeps showing the current tooltip if the problems haven't changed and there is no declaration. But there might have been a declaration before, and in this case this declaration's info would incorrectly be continued to be shown. The new version fixes that by removing the "!decl" part and thus always also testing for existence/equality of the declaration.

Old lines 616 .. 648: In case there is no declaration (!decl), the old version does not remember this in m_currentToolTipDeclaration at the top of this block. But the problems are always remembered. In the new version, the logic is clarified: If either there are problems or there is a declaration, then the current state concerning both is remembered in m_currentToolTipProblems and m_currentToolTipDeclaration, and corresponding widgets will be created in the code below. If not, m_currentToolTipProblems and m_currentToolTipDeclaration aren't touched yet, since there is additional code below that handles additional cases.

New lines 665 .. 669: Here the check is extended to also test for equality of the declaration, i.e., for no declaration, since this case is about to show a problems-only tooltip.

New line 672: Here the code is extended to remember the current state of both the problems and the declaration in the tooltip.

New line 684: If the execution reaches this point, neither a problem nor a declaration has been found that shall be displayed. So, instead of returning nullptr and thus continuing to show whatever tooltip is currently being shown, the correct behavior should be to stop showing the tooltip if there is any.

CMake plugin: Also show an error message if the CMake configuration becomes invalid due to a change, and add an instruction to reload the project manually