As suggested in ECM documentation.

This allows to compare in QML two KTp::Presence objects passed in
QVariant containers

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"

JoinChatRoomDialog requires AccountFactory to have Capabilities feature
enabled.

REVIEW: 126251

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 is still code from Marcin Ziemiński but is using a valid license
so I'm less sure I could just relicense it. I think adding the COPYING file
would be acceptable to Debian FTP-Master, or we could relicense the
code to be LGPL-2.1+.

KTp/OTR/channel-adapter.cpp     GPL (v2 or later)
KTp/OTR/channel-adapter.h       GPL (v2 or later)
KTp/OTR/utils.cpp       GPL (v2 or later)
KTp/OTR/utils.h GPL (v2 or later)

REVIEW: 125925

REVIEW: 125923

Scott Kitterman noticed the license for this code was
"GPL 2.1+" which doesn't exist.

I (Diane Trout) tried to contact the author on a few occasions but
did not see a response.

I believe this code was created as a Google Summer of Code project and
so the following criteria which states that the student needs to choose
a license approved by the mentoring organization.

http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2015/help_page?PageSpeed=noscript#2._What_licenses_do_I_have_to_choose

The most likely thing is that the original license block is a
typo and the student had first written GPL-3, but then changed it to
GPL 2.1, but forgot to add the "Lesser".

This is some additional files that I missed from my previous
review: 125780 but the same justifications should apply.

Scott Kitterman noticed the license for this code was
"GPL 2.1+" which doesn't exist.

I (Diane Trout) tried to contact the author on a few occasions but
did not see a response.

I believe this code was created as a Google Summer of Code project and
so the following criteria which states that the student needs to choose
a license approved by the mentoring organization.

http://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2015/help_page?PageSpeed=noscript#2._What_licenses_do_I_have_to_choose

The most likely thing is that the original license block is a
typo and the student had first written GPL-3, but then changed it to
GPL 2.1, but forgot to add the "Lesser".

REVIEW: 125780

REVIEW: 125644

It's a runtime dep (and marked as such) but does not need to be present
during building.

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"

Don't go one by one, close them in bulk. Makes it look less glitchy and
won't freeze the process.

Reviewed by Martin Klapetek

Properly construct strings
Don't mark as unused if it's used

It's a singleton now

Reviewed by Martin Klapetek