Diffusion KDevelop ffee4672af87

Merge remote-tracking branch 'origin/5.2'
ffee4672af87
Actions

Authored by kfunk on Sep 29 2017, 8:55 AM.

Description

Merge remote-tracking branch 'origin/5.2'

Details

Committed

kfunk

Sep 29 2017, 8:55 AM

Parents

R32:af3d968aa020: cmake: Code cleanup
R32:7aef7769ebe2: ensure folders are watched after interrupting the dirwatcher

Branches

Unknown

Tags

Unknown

kfunk committed R32:ffee4672af87: Merge remote-tracking branch 'origin/5.2' (authored by kfunk).Sep 29 2017, 8:55 AM

Merged Changes

Commit		Author	Details	Committed
af3d968aa020		kfunk	cmake: Code cleanup	Sep 29 2017
3de6e1a36576		kfunk	cmake: Minor speed improvements	Sep 29 2017
6004c8fb46c3		kfunk	cmListFileLexer: Update from CMake v3.9.3	Sep 29 2017
11bc71c177fa	D8045	kfunk	plugins: Unify category names	Sep 29 2017
3228f40d0ead	D8041	kossebau	Use consistently "toolbar" in UI	Sep 29 2017
514036de3149		kfunk	platform: Set SOVERSION to 52	Sep 28 2017
c10d6a48abaa		rjvbb	ensure folders are watched after interrupting the dirwatcher	Sep 28 2017
0cbacfb61aea		kfunk	welcomepage: Cleanup CMake code	Sep 28 2017
903789c9a74f		kfunk	welcomepage: Introduce categorized logging	Sep 28 2017

Changes (62)

				Path	Packages
	M			kdevplatform/CMakeLists.txt
	M			kdevplatform/sublime/idealcontroller.cpp
	M			plugins/android/CMakeLists.txt
	M			plugins/appwizard/CMakeLists.txt
	M			plugins/astyle/CMakeLists.txt
	M			plugins/classbrowser/CMakeLists.txt
	M			plugins/cmake/CMakeLists.txt
	M			plugins/cmake/cmakeutils.cpp
	M			plugins/cmake/duchain/contextbuilder.h
	M			plugins/cmake/duchain/declarationbuilder.cpp
	M			plugins/cmake/parser/cmListFileLexer.c
	M			plugins/cmake/parser/cmakelistsparser.cpp
	M			plugins/cmake/parser/cmakelistsparser.h
	M			plugins/cmakebuilder/CMakeLists.txt
	M			plugins/codeutils/CMakeLists.txt
	M			plugins/contextbrowser/CMakeLists.txt
	M			plugins/cppcheck/CMakeLists.txt
	M			plugins/custom-buildsystem/CMakeLists.txt
	M			plugins/custom-definesandincludes/CMakeLists.txt
	M			plugins/custommake/CMakeLists.txt
	M			plugins/customscript/CMakeLists.txt
	M			plugins/cvs/CMakeLists.txt
	M			plugins/debuggercommon/CMakeLists.txt
	M			plugins/docker/CMakeLists.txt
	M			plugins/documentswitcher/CMakeLists.txt
	M			plugins/execute/CMakeLists.txt
	M			plugins/executeplasmoid/CMakeLists.txt
	M			plugins/executescript/CMakeLists.txt
	M			plugins/externalscript/CMakeLists.txt
	M			plugins/filemanager/CMakeLists.txt
	M			plugins/filetemplates/CMakeLists.txt
	M			plugins/flatpak/CMakeLists.txt
	M			plugins/gdb/CMakeLists.txt
	M			plugins/ghprovider/CMakeLists.txt
	M			plugins/git/CMakeLists.txt
	M			plugins/grepview/CMakeLists.txt
	M			plugins/heaptrack/CMakeLists.txt
	M			plugins/konsole/CMakeLists.txt
	M			plugins/lldb/CMakeLists.txt
	M			plugins/makebuilder/CMakeLists.txt
	M			plugins/ninjabuilder/CMakeLists.txt
	M			plugins/outlineview/CMakeLists.txt
	M			plugins/patchreview/CMakeLists.txt
	M			plugins/perforce/CMakeLists.txt
	M			plugins/problemreporter/CMakeLists.txt
	M			plugins/projectfilter/CMakeLists.txt
	M			plugins/projectmanagerview/CMakeLists.txt
	M			plugins/qmakebuilder/CMakeLists.txt
	M			plugins/qmakemanager/CMakeLists.txt
	M			plugins/qmljs/CMakeLists.txt
	M			plugins/qmljs/duchain/CMakeLists.txt
	M			plugins/qthelp/CMakeLists.txt
	M			plugins/quickopen/CMakeLists.txt
	M			plugins/standardoutputview/CMakeLists.txt
	M			plugins/subversion/CMakeLists.txt
	M			plugins/switchtobuddy/CMakeLists.txt
	M			plugins/testview/CMakeLists.txt
	M			plugins/welcomepage/CMakeLists.txt
	M			plugins/welcomepage/declarative/CMakeLists.txt
	M			plugins/welcomepage/declarative/kdevelopdashboarddeclarativeplugin.cpp
	M			plugins/welcomepage/qml/NewsFeed.qml
	M			plugins/welcomepage/uihelper.cpp