Merge remote-tracking branch 'origin/5.0'
56fec7b16fc9
Actions

Authored by kfunk on Dec 28 2015, 10:48 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Committed

kfunk

Dec 28 2015, 10:48 PM

Differential Revision

D2701: Process QML runtime errors

Parents

R32:221534385f0c: IndexedString::toUrl: Fix too-strict assert
R32:d0596e4b3c60: Merge remote-tracking branch 'origin/5.0'

Branches

Unknown

Tags

Unknown

kfunk committed R32:56fec7b16fc9: Merge remote-tracking branch 'origin/5.0' (authored by kfunk).Dec 28 2015, 10:48 PM

Merged Changes

Commit		Author	Details	Committed
221534385f0c		kfunk	IndexedString::toUrl: Fix too-strict assert	Dec 28 2015
11b8336ae438	D664	kfunk	DUChain: Remove duplicates inside getInheriters	Dec 19 2015
3152fcd981c3		kfunk	Minor: Strip KDevelop prefix	Dec 17 2015
7896e73cb1cc		kfunk	Navigation: Handle anonymous decls in popup	Dec 17 2015
807f422f2389		kfunk	CMake: Remove text from else/endif	Dec 17 2015
ee3d0a311c10		kfunk	OutputModel: Reduce complexity re. pre-filtering	Dec 17 2015
9991a24e3d54	D660	kfunk	OutputView: Filter ANSI sequences	Dec 17 2015
cf64e3567ae0		kfunk	Fix MSVC warnings	Dec 17 2015
d308a4ddc16e		kfunk	clang-tidy: modernize-use-override	Dec 17 2015

Changes (347)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			cmake/modules/KDevPlatformMacros.cmake
	M			debugger/framestack/framestackmodel.h
	M			debugger/framestack/framestackwidget.h
	M			debugger/interfaces/idebugsession.h
	M			debugger/util/pathmappings.cpp
	M			debugger/util/treeitem.h
	M			debugger/util/treemodel.h
	M			debugger/util/treeview.h
	M			debugger/variable/variablecollection.h
	M			debugger/variable/variabletooltip.cpp
	M			debugger/variable/variablewidget.h
	M			documentation/documentationview.h
	M			interfaces/configpage.h
	M			interfaces/iassistant.h
	M			interfaces/icompletionsettings.h
	M			interfaces/icore.h
	M			interfaces/idebugcontroller.h
	M			interfaces/idocumentationcontroller.h
	M			interfaces/iplugin.h
	M			interfaces/iplugincontroller.h
	M			interfaces/iproject.h
	M			interfaces/iprojectcontroller.h
	M			interfaces/iselectioncontroller.h
	M			interfaces/isession.h
	M			interfaces/isourceformatter.h
	M			interfaces/isourceformattercontroller.h
	M			interfaces/itestcontroller.h
	M			interfaces/launchconfigurationtype.h
	M			language/assistant/renameaction.h
	M			language/assistant/renameassistant.h
	M			language/assistant/renamefileaction.h
	M			language/assistant/staticassistant.h
	M			language/assistant/staticassistantsmanager.h
	M			language/backgroundparser/backgroundparser.h
	M			language/backgroundparser/documentchangetracker.h
	M			language/backgroundparser/parsejob.cpp
	M			language/backgroundparser/parsejob.h
	M			language/backgroundparser/parseprojectjob.h
	M			language/backgroundparser/tests/testlanguagesupport.h
	M			language/backgroundparser/tests/testparsejob.h
	M			language/classmodel/allclassesfolder.h
	M			language/classmodel/classmodel.h
	M			language/classmodel/classmodelnode.h
	M			language/classmodel/classmodelnodescontroller.h
	M			language/classmodel/documentclassesfolder.cpp
	M			language/classmodel/documentclassesfolder.h
	M			language/classmodel/projectfolder.h
	M			language/codecompletion/codecompletion.h
	M			language/codecompletion/codecompletionitem.h
	M			language/codecompletion/codecompletionmodel.cpp
	M			language/codecompletion/codecompletionmodel.h
	M			language/codecompletion/codecompletionworker.h
	M			language/codegen/applychangeswidget.h
	M			language/codegen/basicrefactoring.h
	M			language/codegen/coderepresentation.cpp
	M			language/codegen/templaterenderer.cpp
	M			language/codegen/templatesmodel.h
	M			language/duchain/duchain.cpp
	M			language/duchain/duchain.h
	M			language/duchain/duchainutils.cpp
	M			language/duchain/ducontext.h
	M			language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
	M			language/duchain/navigation/abstractdeclarationnavigationcontext.h
	M			language/duchain/navigation/abstractnavigationwidget.h
	M			language/duchain/navigation/usescollector.h
	M			language/duchain/navigation/useswidget.h
	M			language/duchain/topducontext.cpp
	M			language/editor/modificationrevisionset.cpp
	M			language/highlighting/codehighlighting.h
	M			language/highlighting/colorcache.h
	M			language/interfaces/quickopendataprovider.h
	M			outputview/outputexecutejob.h
	M			outputview/outputmodel.cpp
	M			outputview/outputmodel.h
	M			plugins/appwizard/appwizardplugin.h
	M			plugins/appwizard/projectselectionpage.h
	M			plugins/appwizard/projectvcspage.h
	M			plugins/bazaar/bazaarplugin.h
	M			plugins/bazaar/bzrannotatejob.h
	M			plugins/bazaar/copyjob.h
	M			plugins/bazaar/diffjob.h
	M			plugins/classbrowser/classbrowserplugin.cpp
	M			plugins/classbrowser/classbrowserplugin.h
	M			plugins/classbrowser/classtree.h
	M			plugins/classbrowser/classwidget.h
	M			plugins/codeutils/codeutilsplugin.h
	M			plugins/contextbrowser/browsemanager.h
	M			plugins/contextbrowser/contextbrowser.cpp
	M			plugins/contextbrowser/contextbrowser.h
	M			plugins/contextbrowser/contextbrowserview.h
	M			plugins/cvs/checkoutdialog.h
	M			plugins/cvs/commitdialog.h
	M			plugins/cvs/cvsannotatejob.h
	M			plugins/cvs/cvsdiffjob.h
	M			plugins/cvs/cvsgenericoutputview.h
	M			plugins/cvs/cvsjob.h
	M			plugins/cvs/cvslogjob.h
	M			plugins/cvs/cvsmainview.h
	M			plugins/cvs/cvsplugin.cpp
	M			plugins/cvs/cvsplugin.h
	M			plugins/cvs/cvsproxy.h
	M			plugins/cvs/cvsstatusjob.h
	M			plugins/cvs/editorsview.h
	M			plugins/cvs/importdialog.h
	M			plugins/cvs/importmetadatawidget.h
	M			plugins/documentswitcher/documentswitcherplugin.h
	M			plugins/documentview/kdevdocumentmodel.h
	M			plugins/documentview/kdevdocumentselection.h
	M			plugins/documentview/kdevdocumentview.h
	M			plugins/documentview/kdevdocumentviewdelegate.h
	M			plugins/documentview/kdevdocumentviewplugin.cpp
	M			plugins/documentview/kdevdocumentviewplugin.h
	M			plugins/execute/executeplugin.h
	M			plugins/execute/nativeappconfig.h
	M			plugins/execute/nativeappjob.h
	M			plugins/execute/projecttargetscombobox.cpp
	M			plugins/executescript/executescriptplugin.h
	M			plugins/executescript/scriptappconfig.h
	M			plugins/executescript/scriptappjob.h
	M			plugins/externalscript/editexternalscript.h
	M			plugins/externalscript/externalscriptjob.h
	M			plugins/externalscript/externalscriptplugin.cpp
	M			plugins/externalscript/externalscriptplugin.h
	M			plugins/externalscript/externalscriptview.h
	M			plugins/filemanager/bookmarkhandler.h
	M			plugins/filemanager/kdevfilemanagerplugin.cpp
	M			plugins/filemanager/kdevfilemanagerplugin.h
	M			plugins/filetemplates/classidentifierpage.h
	M			plugins/filetemplates/classmemberspage.h
	M			plugins/filetemplates/filetemplatesplugin.cpp
	M			plugins/filetemplates/filetemplatesplugin.h
	M			plugins/filetemplates/licensepage.h
	M			plugins/filetemplates/outputpage.h
	M			plugins/filetemplates/overridespage.h
	M			plugins/filetemplates/templateclassassistant.h
	M			plugins/filetemplates/templateoptionspage.h
	M			plugins/filetemplates/templatepreview.h
	M			plugins/filetemplates/templatepreviewtoolview.h
	M			plugins/filetemplates/templateselectionpage.h
	M			plugins/filetemplates/testcasespage.h
	M			plugins/git/gitmessagehighlighter.h
	M			plugins/git/gitplugin.cpp
	M			plugins/git/gitplugin.h
	M			plugins/git/gitplugincheckinrepositoryjob.h
	M			plugins/git/stashmanagerdialog.h
	M			plugins/git/stashpatchsource.h
	M			plugins/grepview/grepdialog.h
	M			plugins/grepview/grepjob.h
	M			plugins/grepview/grepoutputmodel.h
	M			plugins/grepview/grepoutputview.h
	M			plugins/grepview/grepviewplugin.h
	M			plugins/konsole/kdevkonsoleview.h
	M			plugins/konsole/kdevkonsoleviewplugin.cpp
	M			plugins/konsole/kdevkonsoleviewplugin.h
	M			plugins/openwith/openwithplugin.h
	M			plugins/outlineview/outlinemodel.h
	M			plugins/outlineview/outlineviewplugin.h
	M			plugins/outlineview/outlinewidget.h
	M			plugins/patchreview/localpatchsource.h
	M			plugins/patchreview/patchhighlighter.h
	M			plugins/patchreview/patchreview.cpp
	M			plugins/patchreview/patchreview.h
	M			plugins/patchreview/patchreviewtoolview.h
	M			plugins/problemreporter/problemhighlighter.h
	M			plugins/problemreporter/problemreportermodel.h
	M			plugins/problemreporter/problemreporterplugin.cpp
	M			plugins/problemreporter/problemreporterplugin.h
	M			plugins/problemreporter/problemsview.h
	M			plugins/problemreporter/problemtreeview.h
	M			plugins/projectfilter/comboboxdelegate.h
	M			plugins/projectfilter/filtermodel.h
	M			plugins/projectfilter/projectfilterconfigpage.h
	M			plugins/projectfilter/projectfilterprovider.h
	M			plugins/projectmanagerview/projectbuildsetwidget.h
	M			plugins/projectmanagerview/projectmanagerview.h
	M			plugins/projectmanagerview/projectmanagerviewplugin.cpp
	M			plugins/projectmanagerview/projectmanagerviewplugin.h
	M			plugins/projectmanagerview/projectmodelitemdelegate.h
	M			plugins/projectmanagerview/projectmodelsaver.h
	M			plugins/projectmanagerview/projecttreeview.cpp
	M			plugins/projectmanagerview/projecttreeview.h
	M			plugins/projectmanagerview/vcsoverlayproxymodel.h
	M			plugins/quickopen/actionsquickopenprovider.cpp
	M			plugins/quickopen/documentationquickopenprovider.cpp
	M			plugins/quickopen/expandingtree/expandingdelegate.h
	M			plugins/quickopen/projectfilequickopen.h
	M			plugins/quickopen/quickopenmodel.h
	M			plugins/quickopen/quickopenplugin.cpp
	M			plugins/quickopen/quickopenplugin.h
	M			plugins/quickopen/tests/quickopentestbase.h
	M			plugins/standardoutputview/standardoutputview.cpp
	M			plugins/standardoutputview/standardoutputview.h
	M			plugins/standardoutputview/toolviewdata.h
	M			plugins/subversion/svncheckoutmetadatawidget.h
	M			plugins/subversion/svnimportmetadatawidget.h
	M			plugins/subversion/svninternaljobbase.h
	M			plugins/subversion/svnjobbase.h
	M			plugins/subversion/svnssldialog.h
	M			plugins/switchtobuddy/switchtobuddyplugin.h
	M			plugins/testview/testview.h
	M			plugins/testview/testviewplugin.cpp
	M			plugins/testview/testviewplugin.h
	M			plugins/vcschangesview/vcschangesview.h
	M			plugins/vcschangesview/vcschangesviewplugin.cpp
	M			plugins/welcomepage/declarative/kdevelopdashboarddeclarativeplugin.h
	M			plugins/welcomepage/sessionsmodel.h
	M			plugins/welcomepage/welcomepagedocument.h
	M			plugins/welcomepage/welcomepageplugin.cpp
	M			plugins/welcomepage/welcomepageview.h
	M			project/abstractfilemanagerplugin.h
	M			project/builderjob.h
	M			project/filemanagerlistjob.h
	M			project/importprojectjob.h
	M			project/projectchangesmodel.h
	M			project/projectconfigskeleton.h
	M			project/projectfiltermanager.h
	M			project/projectmodel.h
	M			project/tests/projectmodelperformancetest.h
	M			serialization/indexedstring.cpp
	M			shell/areadisplay.h
	M			shell/checkerstatus.h
	M			shell/configdialog.h
	M			shell/debugcontroller.cpp
	M			shell/debugcontroller.h
	M			shell/documentationcontroller.cpp
	M			shell/documentationcontroller.h
	M			shell/documentcontroller.h
	M			shell/editorconfigpage.cpp
	M			shell/editorconfigpage.h
	M			shell/environmentconfigurebutton.h
	M			shell/filteredproblemstore.h
	M			shell/ktexteditorpluginintegration.cpp
	M			shell/ktexteditorpluginintegration.h
	M			shell/languagecontroller.h
	M			shell/launchconfiguration.h
	M			shell/launchconfigurationdialog.h
	M			shell/loadedpluginsdialog.cpp
	M			shell/mainwindow.h
	M			shell/mainwindow_p.h
	M			shell/openprojectpage.h
	M			shell/partcontroller.h
	M			shell/partdocument.h
	M			shell/plugincontroller.h
	M			shell/problemmodel.h
	M			shell/problemmodelset.h
	M			shell/problemstore.h
	M			shell/progresswidget/overlaywidget.h
	M			shell/progresswidget/progressdialog.h
	M			shell/progresswidget/progressmanager.h
	M			shell/progresswidget/statusbarprogresswidget.h
	M			shell/project.cpp
	M			shell/project.h
	M			shell/projectcontroller.h
	M			shell/projectinfopage.h
	M			shell/projectsourcepage.h
	M			shell/runcontroller.cpp
	M			shell/runcontroller.h
	M			shell/savedialog.h
	M			shell/selectioncontroller.h
	M			shell/session.h
	M			shell/sessioncontroller.cpp
	M			shell/sessioncontroller.h
	M			shell/sessiondialog.h
	M			shell/settings/bgpreferences.h
	M			shell/settings/editstyledialog.h
	M			shell/settings/environmentpreferences.h
	M			shell/settings/languagepreferences.h
	M			shell/settings/pluginpreferences.h
	M			shell/settings/projectpreferences.h
	M			shell/settings/sourceformattersettings.h
	M			shell/settings/templateconfig.h
	M			shell/settings/templatepage.h
	M			shell/sourceformattercontroller.h
	M			shell/testcontroller.h
	M			shell/tests/test_ktexteditorpluginintegration.cpp
	M			shell/tests/test_projectcontroller.cpp
	M			shell/tests/test_shellbuddy.cpp
	M			shell/tests/test_testcontroller.cpp
	M			shell/textdocument.h
	M			shell/uicontroller.cpp
	M			shell/uicontroller.h
	M			shell/watcheddocumentset.h
	M			shell/workingsets/workingsetfilelabel.h
	M			shell/workingsets/workingsettoolbutton.h
	M			shell/workingsets/workingsetwidget.h
	M			sublime/aggregatemodel.h
	M			sublime/area.h
	M			sublime/container.cpp
	M			sublime/container.h
	M			sublime/controller.h
	M			sublime/document.h
	M			sublime/idealbuttonbarwidget.h
	M			sublime/idealdockwidget.h
	M			sublime/ideallayout.h
	M			sublime/idealtoolbutton.h
	M			sublime/mainwindow.h
	M			sublime/mainwindow_p.h
	M			sublime/tests/test_toolviewtoolbar.cpp
	M			sublime/tests/test_view.cpp
	M			sublime/tests/test_viewactivation.cpp
	M			sublime/urldocument.h
	M			sublime/view.h
	M			template/filters/kdevfilters.h
	M			tests/testfile.h
	M			tests/testlanguagecontroller.h
	M			tests/testplugincontroller.h
	M			tests/testproject.h
	M			util/activetooltip.h
	M			util/autoorientedsplitter.h
	M			util/commandexecutor.h
	M			util/environmentselectionmodel.h
	M			util/environmentselectionwidget.h
	M			util/executecompositejob.h
	M			util/focusedtreeview.h
	M			util/foregroundlock.cpp
	M			util/foregroundlock.h
	M			util/jobstatus.h
	M			util/kdevstringhandler.cpp
	M			util/kdevstringhandler.h
	M			util/multilevellistview.cpp
	M			util/multilevellistview.h
	M			util/objectlist.h
	M			util/placeholderitemproxymodel.h
	M			util/processlinemaker.h
	M			util/projecttestjob.h
	M			util/richtextpushbutton.h
	M			util/tests/test_foregroundlock.cpp
	M			util/tests/test_stringhandler.cpp
	M			util/tests/test_stringhandler.h
	M			vcs/dvcs/dvcsjob.h
	M			vcs/dvcs/dvcsplugin.h
	M			vcs/dvcs/ui/branchmanager.h
	M			vcs/dvcs/ui/dvcsimportmetadatawidget.h
	M			vcs/dvcs/ui/revhistory/commitView.h
	M			vcs/dvcs/ui/revhistory/commitlogmodel.h
	M			vcs/interfaces/icontentawareversioncontrol.h
	M			vcs/models/brancheslistmodel.h
	M			vcs/models/vcsannotationmodel.h
	M			vcs/models/vcseventmodel.h
	M			vcs/models/vcsitemeventmodel.h
	M			vcs/vcspluginhelper.h
	M			vcs/widgets/standardvcslocationwidget.h
	M			vcs/widgets/vcscommitdialog.h
	M			vcs/widgets/vcsdiffpatchsources.h
	M			vcs/widgets/vcsdiffwidget.h
	M			vcs/widgets/vcseventwidget.h
	M			vcs/widgets/vcsimportmetadatawidget.h