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"

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"

Makes libakonadi_singlefileresource.so KDELibs4Support-free.

This leads to crashes when the serializer plugin gets loaded from
non-GUI thread (like from KRunner), because AkonadiContact depends
on Qt5WebEngine, and even just linking Qt5WebEngine triggers static
globals initialization that crashes in non-GUI thread.

BUG: 364342
FIXED-IN: 16.08.1

When the Configuration mailbox is not in the top-level folder,
the Akonadi::CollectionFetchJob will return not just the Configuration
Collection but also its parents, which then leads to the Kolab
resource trying to sync tags from e.g. INBOX instead of the actual
Configuration folder.

Some signals are connected to these slots form SingleFileResource,
so it cannot be private. Also, it seems I'm not able to pass
the PMF from the base class, but rather have to use the current
templated class...

This now actually compiles for me with:

gcc (GCC) 6.1.1 20160802

We need to create path.
It's not perfect yet as there is still a problem here, but we can create ical directory now.

CCBUG: 368096

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"