SVN_SILENT made messages (.desktop file)
Move Python's isUsefulType and mergeType utility functions upstream

Ruby and qmljs need them too, so it would be good not to have three copies.
CCMAIL:steckdenis@yahoo.fr
Fix an obvious mistake in the type merging function

it used the pointers refcount instead of the amount of types. heh.
Arguably this is because the API naming sucks.
Thanks to denis for finding this.
Fix regression after merging of the Path infrastructure

Now the path doesn't have a trailing slash and it would fail at
the lookup of the project for the given directory.
Make it possible to feed the reviewboard dialog using the .reviewboardrc files
Move Python's List and Map types upstream.

They are useful for at least Ruby and JS too, and if PHP wanted to
use them, they would work there too.
fix spaces in docstring
Minor: Cleanup includes
Fix crash in DUChain::addDocumentChain

BUG: 333477
Merge remote-tracking branch 'origin/1.6'

Conflicts:
	language/duchain/duchain.cpp
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	plugins/reviewboard/reviewboardplugin.cpp
Port to KDELibs4Support
Don't add QJSON to public link interface

Not needed
Remove the slowest iterations of the quickopen benchmarks

This made the test shaky on CI (esp. in KF5) since it has a timeout
of 120 seconds.
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	tests/json/CMakeLists.txt