REVIEW:129198
BUG:370573

See also https://bugs.freedesktop.org/show_bug.cgi?id=97688

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"

with the DocPath entry this ioslave listed in khelcenter
but we have no docbook, so remove it from khc for now
CCBUG:370573

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"

Tobias Berner authored Aug 17, 2016 and Albert Astals Cid committed Aug 17, 2016

cmake/FindMtp.cmake defines MTP_INCLUDE_DIR, yet it is not used while trying
to link against libmtp in mtp/CMakeLists.txt. This makes it fail with
| /wrkdirs/usr/ports/devel/kio-extras/work/kio-extras-15.12.0/mtp/devicecache.h:32:10: fatal error: 'libmtp.h' file not found
| #include <libmtp.h>

This patch passes it to include_directories, thereby fixing the build on FreeBSD.

REVIEW: 126599

David Binderman authored Aug 15, 2016 and Christoph Feck committed Aug 15, 2016

BUG: 366763
Reviewed by Christoph Feck

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"

When using e. g. Dolphin, which uses QIcon, the thumbnails for folders
would be inconsistent with the normal folder icons.

BUG: 364253
REVIEW: 128164

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"

Fabien Shum-King authored May 17, 2016 and Albert Astals Cid committed May 17, 2016

REVIEW: 127941
BUGS: 357870

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"

REVIEW: 127714

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"

This is the same logic used at link request time, and unbreaks
building on windows

This patch removes the call of LIBMTP_Check_Specific_Device(), since
it is generally not adviced to use it at all, see [1]. Instead, it
should only be used in case LIBMTP_Detect_Raw_Devices() fails.
Looking into other mtp implementations (gvfs, smtpfs) revelas, that
LIBMTP_Check_Specific_Device() is not used at all. Therefore,
this patch brings the kio-mtp implementation more in line with
other implmentations.

It was confirmed [2] that with this patch some Windows Phones (e.g.
Lumia 630) get properly detected and work as expected.

  [1] https://sourceforge.net/p/libmtp/mailman/message/34948820/
  [2] https://www.reddit.com/r/kde/comments/4aggg0

REVIEW: 127386
BUG: 325335

This patch removes the call of LIBMTP_Check_Specific_Device(), since
it is generally not adviced to use it at all, see [1]. Instead, it
should only be used in case LIBMTP_Detect_Raw_Devices() fails.
Looking into other mtp implementations (gvfs, smtpfs) revelas, that
LIBMTP_Check_Specific_Device() is not used at all. Therefore,
this patch brings the kio-mtp implementation more in line with
other implmentations.

It was confirmed [2] that with this patch some Windows Phones (e.g.
Lumia 630) get properly detected and work as expected.

  [1] https://sourceforge.net/p/libmtp/mailman/message/34948820/
  [2] https://www.reddit.com/r/kde/comments/4aggg0

REVIEW: 127386

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"