As discussed on the mailing list:
  https://mail.kde.org/pipermail/kdevelop-devel/2017-September/058823.html

Move all plugins into a single folder:
- $CATEGORY/$PLUGINFOLDER -> plugins/$PLUGINFOLDER
- kdevplatform/plugins/$PLUGINFOLDER -> plugins/$PLUGINFOLDER

Sorry, it works without this patch. Seems like I didn't clean the build
dir properly.

This reverts commit f3d0d879.

Use correct CMake variable

Breaks compilation with Qt 5.6

This reverts commit 5da0a9cd.

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"

Remove weird backslash and quotes to allow CMake to parse these flags and turn -D's to /D's in MSVC case.

(cherry picked from commit 77641873)

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 makes the patchreview plugin update button refresh the diff after
checking out another branch during a branch diff review. Additionally,
don't let the plugin trigger patch updates when it is known that updating
is not supported.

Differential Revision: https://phabricator.kde.org/D7421

(Without the transformations to std::move(...))

(cherry picked from commit f5b25083)

Apparently CMake requires the quotes here

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"

Kevin Funk authored Sep 06, 2017 and Francis Herne committed Sep 06, 2017

Since 0714e5d5 "TypeRegister: Stronger assumptions in debug mode", this
 could hit an assertion when a session cache has types from multiple
 language plugins.

 ---

kdevplatform.language: Factory for this type not loaded: 62
ASSERT: "false" in file ../kdevplatform/language/duchain/types/typeregister.cpp, line 65
zsh: abort (core dumped)

(note that type ID 62 belongs to kdev-python, not kdev-clang)

[...]
#4  0x00007f7ba389bdae in KDevelop::TypeSystem::ensureFactoryLoaded(KDevelop::AbstractTypeData const&) const (this=0x7f7ba4a76640 <KDevelop::TypeSystem::self()::system>, data=...)
    at ../kdevplatform/language/duchain/types/typeregister.cpp:65
#5  0x00007f7ba389ba1e in KDevelop::TypeSystem::create(KDevelop::AbstractTypeData*) const (this=0x7f7ba4a76640 <KDevelop::TypeSystem::self()::system>, data=0x7f7b30297ff4)
    at ../kdevplatform/language/duchain/types/typeregister.cpp:27
#6  0x00007f7ba389db69 in KDevelop::AbstractTypeDataRequest::equals(KDevelop::AbstractTypeData const*) const (this=0x7f7b4a635060, item=0x7f7b30297ff4)
    at ../kdevplatform/language/duchain/types/typerepository.cpp:80
[...]
#16 0x00007f7b579f5da1 in (anonymous namespace)::Visitor::setDeclType<(CXCursorKind)8>(KDevelop::Declaration*, KDevelop::AbstractType*) (this=0x7f7b4a635ce0, decl=0x7f7b2c67f9b0, type=0x7f7b2c6e6630) at ../languages/clang/duchain/builder.cpp:808
[...]

To make it clear it's not our code

Related to https://phabricator.kde.org/D7693

Make it clear it's not our code. Also turn kdevsvncpp into a separate
static library with some warnings disabled.

Make it clear it's not our code

Aaron Puchert authored Sep 05, 2017 and Kevin Funk committed Sep 05, 2017

Summary:
Builds of KDevelop are not reproducible right now because the archives
containing templates contain metadata related to the build environment,
such as the time of checkout. The order of files in an archive is also
not guaranteed.

The Reproducible Builds project recommends [1] to use (in addition to
what we have) --mtime="@${SOURCE_DATE_EPOCH}" and --sort=name. This will
only be used if the environment variable is set. The latter option is
available only since tar 1.28 (from 2014), but we assume that people
have it if they know about reproducible builds.

[1] https://reproducible-builds.org/docs/archives/

Reviewers: #kdevelop, kfunk

Subscribers: kfunk, kdevelop-devel

Differential Revision: https://phabricator.kde.org/D7693

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"

Summary:
QT_USE_QSTRINGBUILDER is the official successor for
QT_USE_FAST_OPERATOR_PLUS & QT_USE_FAST_CONCATENATION, extending coverage to QByteArray.

Test Plan: Builds, local tests fail as before, used for few days without issues.

Reviewers: #kdevelop, kfunk

Reviewed By: #kdevelop, kfunk

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D7687

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"

BUG: 351948
FIXED-IN: 5.2.0