Looks like a typo...

CCMAIl: kde@davidedmundson.co.uk

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"

Caught by Coverity, CID 1340882.

Use CMake variables autoupdated by release script. KSystemLog version is
automatically updated to KDE Applications version.

...by adding the NO_POLICY_SCOPE flag as recommended by ECM's
documentation.

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"

I should really compile before doing a "Compile++" commit.

Seems the code is just unbuildable on Qt 5.4 because it uses the new Q_ENUM macro

Otherwise Q_ENUM is undefined on Qt5.4

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"