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"

# Conflicts:
#	CMakeLists.txt

CCBUG:425281

Using obj->isUMLClassifier() excluded any other object types, which was
introduced with commit ed05f534.

For better readability, the ot_Entity has been implemented separatly.

BUG:425285
FIXED-IN:2.32.01 (KDE release 20.08.1)

Since the name has changed, we can't find the widget by name and
have to use a different approach.

BUG:425281
FIXED-IN:2.32.01 (KDE release 20.08.1)

BUG: 424863
FIXED-IN:2.32.01 (KDE releases 20.08.1)

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"

# Conflicts:
#	CMakeLists.txt

Add KF5::ThreadWeaver as a dependency to KDevTest target.

Because kdevelop 5.2.1 uses include headers from the Threadweaver
library in it's public api, but did not add KF5::ThreadWeaver as
a public dependency, clients get an error when compiling.

BUG:424794
FIXED-IN:2.31.90 (KDE releases 20.07.90)

In ClassifierWidget::drawMembers() and ClassifierWidget::paint() the text
width is now calculated from the width of the widget instead of using the
QFontMetric instance, which fails under certain conditions on Windows 10.

BUG:423660
FIXED-IN:2.31.3 (KDE releases 20.04.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"

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"

> The list was missing the error
> " Unsupported xmi file version: "
>
> Notice that after "version:" there is no version indication.

umbrello/umldoc.cpp
- In function loadFromXMI1, if both "xmi.version" and "xmi:version" are
  not found then do not assume versionString.toDouble() as the version
  because in this case, versionString is empty.
  In the interest of best effort, attempt loading the file if the XMI
  version is unknown.

CCBUG: 56184

The macro '__cplusplus' is now defined by the c++ importer.

BUG:422356
FIXED-IN:2.31.2 (KDE releases 20.04.2)

release-windows-packages: add command line options --tarversion to specify different tar ball version