Merge branch '5.1'
33f15abfa487
Actions

Authored by kossebau on Mar 18 2017, 3:07 PM.

Description

Merge branch '5.1'

Committed

kossebau

Mar 18 2017, 3:07 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
06857e65fb52	kossebau	Pass string replacement argument inside i18n call	Mar 18 2017
2682c1d2544f	kossebau	Remove unused method GrepOutputDelegate::blendColor(...)	Mar 18 2017
5872ff06c322	kossebau	Use i18n(), not tr()	Mar 18 2017
d38d7d3a9072	kfunk	Don't use qCWarning in public header	Mar 18 2017
70bc8a1fa68a	kfunk	Fix compilation	Mar 18 2017
bda72ef18e64	kfunk	Use more categorized logging	Mar 18 2017

				Path	Packages
	M			language/assistant/renameassistant.cpp
	M			language/backgroundparser/backgroundparser.cpp
	M			language/codegen/codegenerator.cpp
	M			outputview/outputmodel.cpp
	M			plugins/appwizard/appwizardplugin.cpp
	M			plugins/codeutils/codeutilsplugin.cpp
	M			plugins/contextbrowser/contextbrowser.cpp
	M			plugins/documentswitcher/documentswitcherplugin.cpp
	M			plugins/execute/executeplugin.cpp
	M			plugins/grepview/grepoutputdelegate.cpp
	M			plugins/grepview/grepoutputdelegate.h
	M			plugins/patchreview/patchreview.cpp
	M			plugins/quickopen/expandingtree/expandingdelegate.cpp
	M			plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
	M			plugins/quickopen/quickopenmodel.cpp
	M			project/builderjob.cpp
	M			project/filemanagerlistjob.cpp
	M			project/helper.cpp
	M			project/projectmodel.cpp
	M			shell/configdialog.cpp
	M			shell/core.cpp
	M			shell/documentationcontroller.cpp
	M			shell/documentcontroller.cpp
	M			shell/languagecontroller.cpp
	M			shell/partcontroller.cpp
	M			shell/plugincontroller.cpp
	M			shell/project.cpp
	M			shell/projectcontroller.cpp
	M			shell/runcontroller.cpp
	M			shell/sessionlock.cpp
	M			shell/settings/pluginpreferences.cpp
	M			shell/settings/sourceformattersettings.cpp
	M			shell/sourceformattercontroller.cpp
	M			shell/textdocument.cpp
	M			shell/workingsets/workingset.cpp
	M			shell/workingsets/workingsettooltipwidget.cpp
	M			sublime/mainwindow_p.cpp
	M			util/formattinghelpers.cpp
	M			vcs/vcspluginhelper.cpp
	M			vcs/widgets/vcsdiffpatchsources.cpp