GitLab

Finishing requires
- a simple parser to be able to parse something
  like 'dirname(__FILE__)."/config.php"' and
- a global variable list for been able to parse something
  like '$afw_root."/config.php"'.

The former string replacement was too general.

BUG:381565
FIXED-IN:2.22.3 (KDE Applications 17.04.3)

BUG:381565
FIXED-IN:2.22.3 (KDE Applications 17.04.3)

CCBUG:381391

Class and association statements could be imported by pasting from
the clipboard or by selecting "from file" in the "new" submenu of
a class diagram context menu.

Parsing errors are logged into the log windows.

See test/import/diagrams/class/classes.txt for the supported statements.

BUG:380266
FIXED-IN:2.22.80 (KDE Applications 17.07.80)

BUG:381393
FIXED-IN:2.22.3 (KDE Applications 17.04.3)

This commit fixes the issue for selecting entries in the tree view.

CCBUG:381363

BUG:381363
FIXED-IN:2.22.3 (KDE Applications 17.04.3)

Selecting an association widget also selects the related labels
which let the selected widget count be > 0.

BUG:381360
FIXED-IN:2.22.3 (KDE Applications 17.04.3)

Keep overwrite related handling for association widgets in sync
with other DocWindow::showDocumentation() methods.

In case overwrite is true the content of the documentation widget
should be overwritten and not saved in widget.

BUG:381016
FIXED-IN:2.22.3 (KDE Applications 17.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"

This bug has been reported by Jonathan Riddell on the umbrello
development list.

Class and association statements could be imported by pasting from
the clipboard or by selecting "from file" in the "new" submenu of
a class diagram context menu.

Parsing errors occured on import are logged into the log window.

See test/import/diagrams/class/examples.txt for examples of
supported statements.

BUG:380266
FIXED-IN:2.22.80 (KDE Applications 17.07.80)
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>

Enable llvm test case only if clang development package has been
found too because it is not optional.

BUG:379293
FIXED-IN:2.22.2 (KDE Applications 17.04.2)

Thanks to Christoph Feck for pointing out how to fix.

BUG:374415
FIXED-IN: 2.22.2 (KDE Applications 17.04.2)

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"