GitLab

CCBUG:413519

Methods on interfaces are always abstract, virtual, non inline, public and can
not override.

CCBUG:413519

CCBUG:413519

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"

`GREATER_EQUAL` was introduced in cmake 3.7, but the specified minimum version is 2.8.11.
So use `NOT LESS` instead to still support older cmake versions too.

Test Plan:
Builds fine with cmake 3.5.2 now, and also newer versions (haven't tried older versions).

Before, I got this error when building umbrello master or 19.08.0 with cmake 3.5.2:
```
CMake Error at CMakeLists.txt:12 (if):
  if given arguments:

    "KDE_APPLICATIONS_VERSION_MICRO" "GREATER_EQUAL" "70"

  Unknown arguments specified
```

Patch provided by: #wbauer
Reviewed By: #habacker
Differential Revision: https://phabricator.kde.org/D23635

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 https://cgit.kde.org/kmymoney.git/commit/?h=4.8&id=05225074146c331e6813dc642c2e557b2b0de940

CCBUG:410904

BUG:410904
FIXED-IN 2.29.1 (KDE Applications 19.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"

Fixup of commit 48ae6b8e.

(cherry picked from commit 0514f21f)

CCBUG:115269
BUG:403808
FIXED-IN:2.29.0 (KDE Applications 19.08.0)

With UML2 a "required interface" association is created by adding a
normal association from the interface to the component, wherein adding
an association from the component to the interface creates a "provided
interface".

With UML1, according to current research, there is no visible label for
a required interface mapping. This behavior has been corrected.

CCBUG:115269
CCBUG:403808
(cherry picked from commit 48ae6b8e)

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:410513
FIXED-IN:2.29.0 (KDE Applications 19.08.0)

CCBUG:115269

If UML2 is not activated, the icon "component1" is used for components.

CCBUG:115269

The shape of the symbol has been modified to look more similar to the state widget.

CCBUG:410152

Previously, the UseCase icon was used for this.

BUG:410508
FIXED-IN:2.28.90 (KDE Applications 19.11.90)

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:410220
FIXED-IN:2.28.90 (KDE Applications 19.07.90)

Fix 'Wrong display of exceptions in activity diagrams Default setting for Association lines unequal to "Polyline"'

BUG:410218
FIXED-IN:2.28.90 (KDE Applications 19.07.90)

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"

CCBUG:410151