Diffusion KDevelop a8d7504b27dd

Merge branch '5.2'
a8d7504b27dd
Actions

Authored by kossebau on Oct 19 2017, 5:53 PM.

Description

Merge branch '5.2'

Details

Committed

kossebau

Oct 19 2017, 5:53 PM

Parents

R32:d896e7489b74: Allow abortion of starting another NativeAppJob
R32:35f3f710c083: Fix registration of the enabled state of plugins

Branches

Unknown

Tags

Unknown

kossebau committed R32:a8d7504b27dd: Merge branch '5.2' (authored by kossebau).Oct 19 2017, 5:53 PM

Merged Changes

Commit		Author	Details	Committed
35f3f710c083	D8156	kossebau	Fix registration of the enabled state of plugins	Oct 17 2017
e78ddf2fb9d6		kossebau	Remove empty init/cleanup methods from unit tests	Oct 17 2017
f5b12920587d		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 16 2017

Changes (36)

		Path
M		kdevplatform/shell/plugincontroller.cpp
M		kdevplatform/shell/plugincontroller.h
M		kdevplatform/shell/settings/pluginpreferences.cpp
M		kdevplatform/shell/shellextension.h
M		kdevplatform/shell/tests/CMakeLists.txt
D		kdevplatform/shell/tests/kdevnonguiinterfaceplugin.json
V		kdevplatform/shell/tests/{ → plugins}/nonguiinterfaceplugin.cpp
P		kdevplatform/shell/tests/nonguiinterfaceplugin.h Deleted after being copied to multiple locations: kdevplatform/shell/tests/plugins/globaldefaultplugin.cpp kdevplatform/shell/tests/plugins/globalnondefaultplugin.cpp kdevplatform/shell/tests/plugins/nonguiinterface.h kdevplatform/shell/tests/plugins/projectdefaultplugin.cpp kdevplatform/shell/tests/plugins/projectnondefaultplugin.cpp
A	(dir)	kdevplatform/shell/tests/plugins/
P		kdevplatform/shell/tests/plugins/globaldefaultplugin.cpp Copied from kdevplatform/shell/tests/nonguiinterfaceplugin.h
A		kdevplatform/shell/tests/plugins/globaldefaultplugin.testpluginjson
P		kdevplatform/shell/tests/plugins/globalnondefaultplugin.cpp Copied from kdevplatform/shell/tests/nonguiinterfaceplugin.h
A		kdevplatform/shell/tests/plugins/globalnondefaultplugin.testpluginjson
P		kdevplatform/shell/tests/plugins/nonguiinterface.h Copied from kdevplatform/shell/tests/nonguiinterfaceplugin.h
V		kdevplatform/shell/tests/{plugins ← }/nonguiinterfaceplugin.cpp
A		kdevplatform/shell/tests/plugins/nonguiinterfaceplugin.testpluginjson
P		kdevplatform/shell/tests/plugins/projectdefaultplugin.cpp Copied from kdevplatform/shell/tests/nonguiinterfaceplugin.h
A		kdevplatform/shell/tests/plugins/projectdefaultplugin.testpluginjson
V		kdevplatform/shell/tests/{plugins/projectnondefaultplugin.cpp ← nonguiinterfaceplugin.h}
A		kdevplatform/shell/tests/plugins/projectnondefaultplugin.testpluginjson
M		kdevplatform/shell/tests/test_plugincontroller.cpp
M		kdevplatform/shell/tests/test_plugincontroller.h
A		kdevplatform/shell/tests/test_pluginenabling.cpp
P		kdevplatform/shell/tests/test_pluginenabling.h Copied from kdevplatform/language/highlighting/tests/test_highlighting.h
M		plugins/clang/tests/test_refactoring.cpp
M		plugins/clang/tests/test_refactoring.h
M		plugins/cmake/tests/test_cmakemanager.cpp
M		plugins/cmake/tests/test_ctestfindsuites.cpp
M		plugins/custom-buildsystem/tests/test_custombuildsystemplugin.cpp
M		plugins/qmakemanager/parser/tests/lexertest.cpp
M		plugins/qmakemanager/parser/tests/lexertest.h
M		plugins/qmakemanager/tests/test_qmakeproject.cpp
M		plugins/qmljs/duchain/tests/test_qmljsdeclarations.cpp
M		plugins/qmljs/tests/test_files.cpp
M		plugins/subversion/tests/test_svnimport.cpp
M		plugins/subversion/tests/test_svnrecursiveadd.cpp