Merge remote-tracking branch 'origin/5.0'
8ba9259d0013
Actions

Authored by kfunk.

Description

Merge remote-tracking branch 'origin/5.0'

Details

Committed

Jan 20 2016, 3:04 PM

Parents

R33:14df9ba1a88e: TopContextDynamicData: Fix bug in loadPartialData
R33:3439495fb969: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

kfunk committed R33:8ba9259d0013: Merge remote-tracking branch 'origin/5.0' (authored by kfunk).Jan 20 2016, 3:04 PM

Merged Changes

Commit		Author	Details	Committed
14df9ba1a88e	D845	kfunk	TopContextDynamicData: Fix bug in loadPartialData	Jan 20 2016
abfa9b80fb61	D794	apuzio/kfunk	MainWindow: Add indicator for read-only files	Jan 20 2016
13e5191115d5		kfunk	Prefer static version of QFileInfo::exists	Jan 20 2016
5e9cca908413		l10n daemon script	SVN_SILENT made messages (.desktop file)	Jan 19 2016
fed8484b1ab7		mwolff	Ensure the languages of possible resolutions match.	Jan 19 2016
4de9f8c44926		Pino Toscano/kfunk	i18n: typo fixes	Jan 19 2016
6e9e028e44fe	D838	mwolff	Always force recursive list jobs.	Jan 19 2016
4789ca012a8b	D838	mwolff	Always force recursive list jobs.	Jan 19 2016
8be5a540f62c		kfunk	OutputExecuteJob: Handle progress properly	Jan 18 2016
dec9cb9f44a2		kfunk	Make compile with Qt 5.4	Jan 18 2016
aa6d1ef577e4		Sergobot	Fix almost all the remaining Clazy warnings I fixed almost all the remaining…	Jan 18 2016
9b16e0b7e468		Sven Brauch	correctly load completion list icons from our own data directory	Jan 16 2016
60f12d0a8375		l10n daemon script	SVN_SILENT made messages (.desktop file)	Jan 16 2016

Changes (271)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			debugger/breakpoint/breakpointdetails.cpp
	M			debugger/breakpoint/breakpointwidget.cpp
	M			debugger/framestack/framestackmodel.cpp
	M			debugger/interfaces/idebugsession.cpp
	M			debugger/util/treeitem.cpp
	M			debugger/variable/variablecollection.cpp
	M			debugger/variable/variablecollection.h
	M			debugger/variable/variabletooltip.cpp
	M			interfaces/contextmenuextension.cpp
	M			interfaces/ipartcontroller.cpp
	M			interfaces/iplugin.cpp
	M			interfaces/isourceformatter.cpp
	M			language/assistant/renameaction.cpp
	M			language/assistant/renameassistant.cpp
	M			language/backgroundparser/backgroundparser.cpp
	M			language/backgroundparser/documentchangetracker.cpp
	M			language/backgroundparser/parsejob.cpp
	M			language/backgroundparser/parseprojectjob.cpp
	M			language/backgroundparser/tests/test_backgroundparser.cpp
	M			language/backgroundparser/tests/testlanguagesupport.cpp
	M			language/classmodel/classmodel.cpp
	M			language/classmodel/classmodelnode.cpp
	M			language/classmodel/documentclassesfolder.cpp
	M			language/classmodel/projectfolder.cpp
	M			language/codecompletion/codecompletion.cpp
	M			language/codecompletion/codecompletionhelper.cpp
	M			language/codecompletion/codecompletionmodel.cpp
	M			language/codecompletion/normaldeclarationcompletionitem.cpp
	M			language/codegen/applychangeswidget.cpp
	M			language/codegen/basicrefactoring.cpp
	M			language/codegen/basicrefactoring.h
	M			language/codegen/codedescription.cpp
	M			language/codegen/codedescriptionmetatypes.h
	M			language/codegen/coderepresentation.cpp
	M			language/codegen/documentchangeset.cpp
	M			language/codegen/sourcefiletemplate.cpp
	M			language/codegen/templateclassgenerator.cpp
	M			language/codegen/templateengine.cpp
	M			language/codegen/templaterenderer.cpp
	M			language/codegen/templatesmodel.cpp
	M			language/codegen/tests/test_documentchangeset.cpp
	M			language/codegen/tests/test_templateclassgenerator.cpp
	M			language/codegen/tests/test_templaterenderer.cpp
	M			language/codegen/tests/test_templatesmodel.cpp
	M			language/codegen/utilities.h
	M			language/duchain/classdeclaration.cpp
	M			language/duchain/declaration.cpp
	M			language/duchain/declarationid.cpp
	M			language/duchain/definitions.cpp
	M			language/duchain/duchain.cpp
	M			language/duchain/duchaindumper.cpp
	M			language/duchain/duchainutils.cpp
	M			language/duchain/ducontext.cpp
	M			language/duchain/dumpdotgraph.cpp
	M			language/duchain/functiondefinition.cpp
	M			language/duchain/identifier.cpp
	M			language/duchain/importers.cpp
	M			language/duchain/instantiationinformation.cpp
	M			language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
	M			language/duchain/navigation/abstractdeclarationnavigationcontext.h
	M			language/duchain/navigation/abstractincludenavigationcontext.cpp
	M			language/duchain/navigation/abstractincludenavigationcontext.h
	M			language/duchain/navigation/abstractnavigationcontext.cpp
	M			language/duchain/navigation/abstractnavigationwidget.cpp
	M			language/duchain/navigation/problemnavigationcontext.cpp
	M			language/duchain/navigation/problemnavigationcontext.h
	M			language/duchain/navigation/usescollector.cpp
	M			language/duchain/navigation/usesnavigationcontext.cpp
	M			language/duchain/navigation/usesnavigationcontext.h
	M			language/duchain/navigation/useswidget.cpp
	M			language/duchain/parsingenvironment.cpp
	M			language/duchain/persistentsymboltable.cpp
	M			language/duchain/problem.cpp
	M			language/duchain/tests/test_duchain.cpp
	M			language/duchain/tests/test_duchainshutdown.cpp
	M			language/duchain/tests/test_identifier.cpp
	M			language/duchain/topducontext.cpp
	M			language/duchain/topducontextdynamicdata.cpp
	M			language/duchain/types/abstracttype.cpp
	M			language/duchain/types/constantintegraltype.cpp
	M			language/duchain/types/functiontype.cpp
	M			language/duchain/types/integraltype.cpp
	M			language/duchain/types/pointertype.cpp
	M			language/duchain/types/referencetype.cpp
	M			language/duchain/types/structuretype.cpp
	M			language/duchain/types/typealiastype.cpp
	M			language/duchain/types/typerepository.cpp
	M			language/duchain/types/unsuretype.cpp
	M			language/duchain/uses.cpp
	M			language/editor/modificationrevisionset.cpp
	M			language/highlighting/codehighlighting.cpp
	M			language/highlighting/colorcache.cpp
	M			language/highlighting/configurablecolors.cpp
	M			language/interfaces/quickopendataprovider.cpp
	M			language/interfaces/quickopenfilter.h
	M			language/util/setrepository.cpp
	M			outputview/outputdelegate.h
	M			outputview/outputexecutejob.cpp
	M			outputview/outputfilteringstrategies.cpp
	M			outputview/tests/test_filteringstrategy.cpp
	M			outputview/tests/test_outputmodel.cpp
	M			outputview/tests/testlinebuilderfunctions.h
	M			plugins/appwizard/appwizardplugin.cpp
	M			plugins/appwizard/projectselectionpage.cpp
	M			plugins/appwizard/projecttemplatesmodel.cpp
	M			plugins/appwizard/projecttemplatesmodel.h
	M			plugins/appwizard/projectvcspage.cpp
	M			plugins/bazaar/bazaarplugin.cpp
	M			plugins/bazaar/bazaarutils.cpp
	M			plugins/bazaar/bzrannotatejob.cpp
	M			plugins/bazaar/tests/test_bazaar.cpp
	M			plugins/classbrowser/classbrowserplugin.cpp
	M			plugins/classbrowser/classwidget.cpp
	M			plugins/codeutils/codeutilsplugin.cpp
	M			plugins/contextbrowser/browsemanager.cpp
	M			plugins/contextbrowser/browsemanager.h
	M			plugins/contextbrowser/contextbrowser.cpp
	M			plugins/contextbrowser/contextbrowserview.cpp
	M			plugins/cvs/checkoutdialog.cpp
	M			plugins/cvs/cvsannotatejob.cpp
	M			plugins/cvs/cvsdiffjob.cpp
	M			plugins/cvs/cvsjob.cpp
	M			plugins/cvs/cvsmainview.cpp
	M			plugins/cvs/cvsplugin.cpp
	M			plugins/cvs/cvsproxy.cpp
	M			plugins/cvs/cvsproxy.h
	M			plugins/cvs/cvsstatusjob.cpp
	M			plugins/cvs/editorsview.cpp
	M			plugins/cvs/importdialog.cpp
	M			plugins/cvs/tests/test_cvs.cpp
	M			plugins/documentswitcher/documentswitcherplugin.cpp
	M			plugins/documentswitcher/documentswitcherplugin.h
	M			plugins/documentswitcher/documentswitchertreeview.h
	M			plugins/documentview/kdevdocumentview.cpp
	M			plugins/documentview/kdevdocumentviewplugin.cpp
	M			plugins/execute/executeplugin.cpp
	M			plugins/execute/nativeappconfig.cpp
	M			plugins/execute/nativeappjob.cpp
	M			plugins/execute/projecttargetscombobox.cpp
	M			plugins/executescript/executescriptplugin.cpp
	M			plugins/executescript/scriptappconfig.cpp
	M			plugins/executescript/scriptappconfig.h
	M			plugins/executescript/scriptappjob.cpp
	M			plugins/externalscript/externalscriptjob.cpp
	M			plugins/externalscript/externalscriptplugin.cpp
	M			plugins/externalscript/externalscriptview.cpp
	M			plugins/filemanager/kdevfilemanagerplugin.cpp
	M			plugins/filetemplates/classmemberspage.cpp
	M			plugins/filetemplates/filetemplatesplugin.cpp
	M			plugins/filetemplates/licensepage.cpp
	M			plugins/filetemplates/main.cpp
	M			plugins/filetemplates/outputpage.cpp
	M			plugins/filetemplates/overridespage.cpp
	M			plugins/filetemplates/templateclassassistant.cpp
	M			plugins/filetemplates/templateoptionspage.cpp
	M			plugins/filetemplates/templatepreview.cpp
	M			plugins/filetemplates/templateselectionpage.cpp
	M			plugins/filetemplates/tests/test_generationtest.cpp
	M			plugins/genericprojectmanager/test/test_projectload.cpp
	M			plugins/git/gitjob.h
	M			plugins/git/gitplugin.cpp
	M			plugins/git/stashmanagerdialog.cpp
	M			plugins/git/tests/test_git.cpp
	M			plugins/grepview/grepdialog.cpp
	M			plugins/grepview/grepoutputdelegate.h
	M			plugins/grepview/grepoutputmodel.cpp
	M			plugins/grepview/grepoutputview.cpp
	M			plugins/grepview/greputil.cpp
	M			plugins/grepview/grepviewplugin.cpp
	M			plugins/grepview/tests/test_findreplace.cpp
	M			plugins/konsole/kdevkonsoleviewplugin.cpp
	M			plugins/openwith/openwithplugin.cpp
	M			plugins/outlineview/outlinenode.cpp
	M			plugins/outlineview/outlinewidget.cpp
	M			plugins/patchreview/localpatchsource.cpp
	M			plugins/patchreview/patchhighlighter.cpp
	M			plugins/patchreview/patchreview.cpp
	M			plugins/patchreview/patchreviewtoolview.cpp
	M			plugins/problemreporter/problemhighlighter.cpp
	M			plugins/problemreporter/problemnavigationcontext.cpp
	M			plugins/problemreporter/problemnavigationcontext.h
	M			plugins/problemreporter/problemreporterplugin.cpp
	M			plugins/problemreporter/problemsview.cpp
	M			plugins/problemreporter/problemtreeview.cpp
	M			plugins/projectfilter/tests/test_projectfilter.cpp
	M			plugins/projectmanagerview/projectbuildsetwidget.cpp
	M			plugins/projectmanagerview/projectmanagerview.cpp
	M			plugins/projectmanagerview/projectmanagerviewplugin.cpp
	M			plugins/projectmanagerview/projectmodelsaver.cpp
	M			plugins/projectmanagerview/projecttreeview.cpp
	M			plugins/projectmanagerview/vcsoverlayproxymodel.cpp
	M			plugins/quickopen/actionsquickopenprovider.cpp
	M			plugins/quickopen/actionsquickopenprovider.h
	M			plugins/quickopen/declarationlistquickopen.h
	M			plugins/quickopen/documentationquickopenprovider.h
	M			plugins/quickopen/duchainitemquickopen.cpp
	M			plugins/quickopen/duchainitemquickopen.h
	M			plugins/quickopen/expandingtree/expandingdelegate.cpp
	M			plugins/quickopen/expandingtree/expandingtree.h
	M			plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
	M			plugins/quickopen/projectfilequickopen.cpp
	M			plugins/quickopen/projectitemquickopen.cpp
	M			plugins/quickopen/projectitemquickopen.h
	M			plugins/quickopen/quickopenplugin.cpp
	M			plugins/quickopen/quickopenplugin.h
	M			plugins/quickopen/tests/quickopentestbase.cpp
	M			plugins/quickopen/tests/test_quickopen.cpp
	M			plugins/standardoutputview/outputwidget.cpp
	M			plugins/standardoutputview/tests/test_standardoutputview.cpp
	M			plugins/subversion/kdevsvnplugin.cpp
	M			plugins/subversion/svncheckoutjob.cpp
	M			plugins/subversion/svnclient.cpp
	M			plugins/subversion/svncommitjob.cpp
	M			plugins/subversion/svndiffjob.cpp
	M			plugins/subversion/svnimportjob.cpp
	M			plugins/subversion/svninternaljobbase.cpp
	M			plugins/subversion/svnjobbase.cpp
	M			plugins/subversion/svnlocationwidget.h
	M			plugins/subversion/svnssldialog.cpp
	M			plugins/subversion/tests/svnimport.cpp
	M			plugins/subversion/tests/svnrecursiveadd.cpp
	M			plugins/switchtobuddy/switchtobuddyplugin.cpp
	M			plugins/testview/testview.cpp
	M			plugins/testview/testviewplugin.cpp
	M			plugins/vcschangesview/vcschangesviewplugin.cpp
	M			plugins/welcomepage/welcomepagedocument.cpp
	M			plugins/welcomepage/welcomepageplugin.cpp
	M			plugins/welcomepage/welcomepageview.cpp
	M			plugins/welcomepage/welcomepageview.h
	M			project/abstractfilemanagerplugin.cpp
	M			project/abstractfilemanagerplugin.h
	M			project/filemanagerlistjob.cpp
	M			project/filemanagerlistjob.h
	M			project/helper.cpp
	M			project/projectmodel.cpp
	M			project/tests/projectmodelperformancetest.cpp
	M			project/tests/test_projectmodel.cpp
	M			serialization/tests/test_indexedstring.cpp
	M			serialization/tests/test_itemrepository.cpp
	M			shell/mainwindow.cpp
	M			shell/mainwindow.h
	M			shell/mainwindow_p.h
	M			shell/projectcontroller.cpp
	M			shell/settings/templatepage.cpp
	M			shell/tests/test_sessioncontroller.cpp
	M			template/filters/kdevfilters.cpp
	M			tests/json/delayedoutput.cpp
	M			tests/json/jsondeclarationtests.h
	M			tests/json/jsonducontexttests.h
	M			tests/json/jsontesthelpers.h
	M			tests/json/jsontypetests.h
	M			tests/json/testsuite.h
	M			tests/testhelpers.h
	M			tests/testproject.cpp
	M			tests/testproject.h
	M			util/duchainify/main.cpp
	M			util/environmentgrouplist.cpp
	M			util/formattinghelpers.h
	M			util/kdevstringhandler.cpp
	M			util/path.cpp
	M			util/shellutils.cpp
	M			util/tests/test_embeddedfreetree.cpp
	M			util/tests/test_environment.cpp
	M			util/tests/test_path.cpp
	M			vcs/dvcs/dvcsjob.cpp
	M			vcs/dvcs/tests/test_dvcsjob.cpp
	M			vcs/models/brancheslistmodel.cpp
	M			vcs/models/tests/test_models.cpp
	M			vcs/vcsrevision.cpp
	M			vcs/widgets/vcsdiffpatchsources.cpp
	M			vcs/widgets/vcsdiffpatchsources.h