Diffusion KDevelop e47c5e98b4a2

Merge remote-tracking branch 'origin/5.0'
e47c5e98b4a2
Actions

Authored by kfunk on Jul 26 2016, 7:33 AM.

Description

Merge remote-tracking branch 'origin/5.0'

Non-trivial merge.

Skipped merging the following changes due to :

ba4a7221acd668bfedf49ebeb14ff296261b3d35 Fix GDB unit tests for 5.0 branch Problem: Same patch for master already got applied
16bd7996c38e2f4774d9fbf2b2925119857d8557 Turn off gdb disable-randomization when testing Problem: No testing mode (m_testing variable) anymore? (didn't compile, please re-apply)

@Peifeng: Please double-check master

CCMAIL: 7437103@gmail.com

Details

Committed

kfunk

Jul 26 2016, 7:40 AM

Parents

R32:f69656872283: Implement color scheme selection from these installed in the system using…
R32:78b9a078b9c5: Add clang 4.0 to the set of known versions

Branches

Unknown

Tags

Unknown

kfunk committed R32:e47c5e98b4a2: Merge remote-tracking branch 'origin/5.0' (authored by kfunk).Jul 26 2016, 7:40 AM

Merged Changes

Commit		Author	Details	Committed
78b9a078b9c5		zwabel	Add clang 4.0 to the set of known versions	Jul 25 2016
ee4a9573c21e		zwabel	Adapt to changes in kdevplatform	Jul 25 2016
880cf77312d0		kfunk	Extend clang-parser: Print spelling name range	Jul 25 2016
ddeb2f2db6b7		brauch	clang, qmljs: adapt to changed navigation widget API	Jul 23 2016
1f93bfb425a9		zwabel	Add an EXPECT_FAIL test for a clang BUG w.r.t. use building for function macros	Jul 22 2016
96dffcb668d3		brauch	macro navigation: escape macro body before displaying	Jul 21 2016
e2a18a865f97		kfunk	Drop unneeded Qt5Script dependency	Jul 21 2016
5d076e294382		brauch	Hopefully fix screwed-up clang higlighting.	Jul 20 2016
50041d950494		zwabel	Search declarations by ID in addition to their range	Jul 20 2016
a36ae3281e24		zwabel	If no pinned translation unit is available, ask the duchain	Jul 20 2016
1c2f332ce168		kfunk	Install appdata to KDE_INSTALL_METAINFODIR	Jul 18 2016
33ae01fdb98c		brauch	assistants: unbreak tests	Jul 17 2016
d03ce4888289		brauch	adapt signature assistant: unlock duchain lock before executing action	Jul 17 2016
16bd7996c38e	D2188	qi437103	Turn off gdb disable-randomization when testing	Jul 15 2016
ec1488f41772	D2178	qi437103	Improve gdb plugin unit tests for 5.0 branch	Jul 15 2016
ba4a7221acd6	D2179	qi437103	Fix GDB unit tests for 5.0 branch	Jul 15 2016
a844f60637ad		kfunk	Perf: Reduce calls to availableSessionInfos()	Jul 14 2016
ff9fc461dc02		kfunk	Revert "Search for binary Qt resource, containing breeze theme. If found…	Jul 14 2016
0bbd4598a721		kfunk	Revert "Add debug output to tryLoadIconResources"	Jul 14 2016
c9072bb4f3e3		brauch	Do not add compiler specific include paths twice	Jul 13 2016
43490f257a1c		kfunk	test_qmakeproject: Fix unit test, cleanup	Jul 13 2016

Changes (33)

				Path	Packages
	M			CMakeLists.txt
	M			app/main.cpp
	M			cmake/modules/FindClang.cmake
	M			debuggers/gdb/debugsession.cpp
	M			debuggers/gdb/debugsession.h
	M			debuggers/gdb/gdb.h
	M			debuggers/gdb/gdbframestackmodel.cpp
	M			debuggers/gdb/unittests/test_gdb.cpp
	M			languages/clang/clangparsejob.cpp
	M			languages/clang/codecompletion/completionhelper.cpp
	M			languages/clang/codecompletion/context.cpp
	M			languages/clang/codegen/adaptsignatureaction.cpp
	M			languages/clang/duchain/clangducontext.cpp
	M			languages/clang/duchain/clangducontext.h
	M			languages/clang/duchain/clanghelpers.cpp
	M			languages/clang/duchain/clanghelpers.h
	M			languages/clang/duchain/clangindex.cpp
	M			languages/clang/duchain/debugvisitor.cpp
	M			languages/clang/duchain/macronavigationcontext.cpp
	M			languages/clang/duchain/navigationwidget.cpp
	M			languages/clang/duchain/navigationwidget.h
	M			languages/clang/tests/test_assistants.cpp
	M			languages/clang/tests/test_duchain.cpp
	M			languages/clang/tests/test_duchain.h
	M			languages/plugins/custom-definesandincludes/definesandincludesmanager.cpp
	M			languages/qmljs/duchain/navigation/navigationwidget.cpp
	M			languages/qmljs/duchain/navigation/navigationwidget.h
	M			languages/qmljs/duchain/qmljsducontext.cpp
	M			languages/qmljs/duchain/qmljsducontext.h
	M			languages/qmljs/kdevqmljsplugin.cpp
	M			languages/qmljs/libs/CMakeLists.txt
	M			projectmanagers/cmake/CMakeLists.txt
	M			projectmanagers/qmake/tests/test_qmakeproject.cpp