Merge branch '5.3'
ae8544cd183d
Actions

Authored by kossebau on Aug 15 2018, 4:12 PM.

Description

Merge branch '5.3'

Details

Committed

Aug 15 2018, 4:12 PM

Parents

R32:b8a14ad882a8: Bump versions for what will become 5.4 one day
R32:2f72b8f5bb2c: TestKTextEditorPluginIntegration: add QEXPECT_FAIL for mainwindow yet alive

Branches

Unknown

Tags

Unknown

kossebau committed R32:ae8544cd183d: Merge branch '5.3' (authored by kossebau).Aug 15 2018, 4:12 PM

Merged Changes

Commit		Author	Details	Committed
2f72b8f5bb2c	D14742	kossebau	TestKTextEditorPluginIntegration: add QEXPECT_FAIL for mainwindow yet alive	Aug 15 2018
dff6fe84eef3		kossebau	Clean-up duplicated ;;	Aug 15 2018
3f3a62893d07		kossebau	File templates: add comment "Assignment operator" in generated API dox	Aug 15 2018
835b11640732		kossebau	Generate strings with lists by collecting items, then use QSL::join()	Aug 15 2018
6210edbe90f9		kossebau	Use QString::chop	Aug 15 2018
919f5cbf33d2		kossebau	Use QString::truncate	Aug 15 2018
923da8209d7b		kossebau	Do not reimplement QStringList::contains	Aug 15 2018
1312363dabd8		kossebau	Use QChar/QLatin1Char/char for single char strings where possible	Aug 15 2018
f8bbbd020f3d		kossebau	Use initializer list with containers and multiple initial elements	Aug 15 2018
074b93768187		kossebau	Use reserve() before appending with known size	Aug 15 2018
d9efcd2e1d19		kossebau	Create strings in one expression (saving mallocs thanks to QStringBuilder)	Aug 15 2018
fd49ad513a1e		kossebau	Gdb plugin: remove outdated bogus code adding a \n, just to be removed	Aug 15 2018
a863f9fe9a66		kossebau	More const ref argument passing	Aug 15 2018
aa167a2de736		brauch	Set version number to 5.2.80	Aug 14 2018

Changes (178)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			app/plasma/dataengine/kdevelopsessionsservice.cpp
	M			app/plasma/runner/kdevelopsessions.cpp
	M			file_templates/common/class_method_declaration_apidox_cpp.txt
	M			kdevplatform/debugger/variable/variablecollection.cpp
	M			kdevplatform/debugger/variable/variabletooltip.cpp
	M			kdevplatform/language/classmodel/classmodel.cpp
	M			kdevplatform/language/codecompletion/codecompletionitemgrouper.h
	M			kdevplatform/language/codecompletion/codecompletiontesthelper.h
	M			kdevplatform/language/codegen/applychangeswidget.cpp
	M			kdevplatform/language/codegen/codedescription.cpp
	M			kdevplatform/language/codegen/codedescription.h
	M			kdevplatform/language/codegen/documentchangeset.cpp
	M			kdevplatform/language/codegen/sourcefiletemplate.cpp
	M			kdevplatform/language/codegen/templateclassgenerator.cpp
	M			kdevplatform/language/codegen/templaterenderer.cpp
	M			kdevplatform/language/codegen/templatesmodel.cpp
	M			kdevplatform/language/duchain/ducontext.cpp
	M			kdevplatform/language/duchain/identifier.cpp
	M			kdevplatform/language/duchain/instantiationinformation.cpp
	M			kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
	M			kdevplatform/language/duchain/navigation/usescollector.cpp
	M			kdevplatform/language/duchain/navigation/useswidget.cpp
	M			kdevplatform/language/duchain/parsingenvironment.cpp
	M			kdevplatform/language/duchain/problem.cpp
	M			kdevplatform/language/duchain/stringhelpers.cpp
	M			kdevplatform/language/duchain/topducontextdynamicdata.cpp
	M			kdevplatform/language/duchain/types/functiontype.cpp
	M			kdevplatform/language/duchain/types/unsuretype.cpp
	M			kdevplatform/language/editor/modificationrevisionset.cpp
	M			kdevplatform/outputview/outputmodel.cpp
	M			kdevplatform/outputview/tests/test_filteringstrategy.cpp
	M			kdevplatform/project/builderjob.cpp
	M			kdevplatform/project/projectbuildsetmodel.cpp
	M			kdevplatform/project/projectchangesmodel.cpp
	M			kdevplatform/serialization/itemrepository.h
	M			kdevplatform/shell/documentcontroller.cpp
	M			kdevplatform/shell/languagecontroller.cpp
	M			kdevplatform/shell/launchconfigurationdialog.cpp
	M			kdevplatform/shell/loadedpluginsdialog.cpp
	M			kdevplatform/shell/openprojectdialog.cpp
	M			kdevplatform/shell/plugincontroller.cpp
	M			kdevplatform/shell/projectcontroller.cpp
	M			kdevplatform/shell/projectsourcepage.cpp
	M			kdevplatform/shell/runcontroller.cpp
	M			kdevplatform/shell/sessioncontroller.cpp
	M			kdevplatform/shell/settings/environmentprofilemodel.cpp
	M			kdevplatform/shell/settings/environmentwidget.cpp
	M			kdevplatform/shell/statusbar.cpp
	M			kdevplatform/shell/tests/test_ktexteditorpluginintegration.cpp
	M			kdevplatform/shell/tests/test_problemmodel.cpp
	M			kdevplatform/shell/workingsets/workingset.cpp
	M			kdevplatform/sublime/area.cpp
	M			kdevplatform/sublime/areaindex.cpp
	M			kdevplatform/sublime/controller.cpp
	M			kdevplatform/sublime/idealdockwidget.cpp
	M			kdevplatform/sublime/mainwindow.cpp
	M			kdevplatform/sublime/mainwindow_p.cpp
	M			kdevplatform/template/filters/kdevfilters.cpp
	M			kdevplatform/tests/json/declarationvalidator.cpp
	M			kdevplatform/util/commandexecutor.cpp
	M			kdevplatform/util/environmentprofilelist.cpp
	M			kdevplatform/util/formattinghelpers.cpp
	M			kdevplatform/util/kdevstringhandler.cpp
	M			kdevplatform/util/multilevellistview.cpp
	M			kdevplatform/util/path.cpp
	M			kdevplatform/vcs/models/vcsfilechangesmodel.cpp
	M			kdevplatform/vcs/models/vcsitemeventmodel.cpp
	M			kdevplatform/vcs/widgets/vcsdiffpatchsources.cpp
	M			plugins/appwizard/appwizardplugin.cpp
	M			plugins/appwizard/projectselectionpage.cpp
	M			plugins/bazaar/bazaarplugin.cpp
	M			plugins/bazaar/bazaarutils.cpp
	M			plugins/bazaar/bzrannotatejob.cpp
	M			plugins/clang/clangsupport.cpp
	M			plugins/clang/codecompletion/context.cpp
	M			plugins/clang/codecompletion/includepathcompletioncontext.cpp
	M			plugins/clang/codegen/adaptsignatureassistant.cpp
	M			plugins/clang/codegen/codegenhelper.cpp
	M			plugins/clang/codegen/sourcemanipulation.cpp
	M			plugins/clang/duchain/clangproblem.cpp
	M			plugins/clang/duchain/debugvisitor.cpp
	M			plugins/clang/duchain/documentfinderhelpers.cpp
	M			plugins/clang/duchain/macronavigationcontext.cpp
	M			plugins/clang/duchain/todoextractor.cpp
	M			plugins/clang/duchain/types/classspecializationtype.cpp
	M			plugins/clang/duchain/unknowndeclarationproblem.cpp
	M			plugins/clang/duchain/unsavedfile.cpp
	M			plugins/clang/util/clangutils.cpp
	M			plugins/cmake/cmakecodecompletionmodel.cpp
	M			plugins/cmake/cmakeedit.cpp
	M			plugins/cmake/cmakeextraargumentshistory.cpp
	M			plugins/cmake/cmakeserverimportjob.cpp
	M			plugins/cmake/cmakeutils.cpp
	M			plugins/cmake/parser/cmakelistsparser.cpp
	M			plugins/cmake/settings/cmakecachemodel.cpp
	M			plugins/cmakebuilder/cmakebuilder.cpp
	M			plugins/cmakebuilder/prunejob.cpp
	M			plugins/contextbrowser/contextbrowser.cpp
	M			plugins/custom-buildsystem/custombuildsystemconfigwidget.cpp
	M			plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp
	M			plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
	M			plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
	M			plugins/custom-definesandincludes/kcm_widget/includesmodel.cpp
	M			plugins/custom-definesandincludes/kcm_widget/projectpathswidget.cpp
	M			plugins/custommake/makefileresolver/makefileresolver.cpp
	M			plugins/customscript/customscript_plugin.cpp
	M			plugins/cvs/cvsannotatejob.cpp
	M			plugins/debuggercommon/midebugsession.cpp
	M			plugins/debuggercommon/mivariablecontroller.cpp
	M			plugins/debuggercommon/registers/registercontroller.cpp
	M			plugins/debuggercommon/registers/registercontroller_arm.cpp
	M			plugins/debuggercommon/registers/registercontroller_x86.cpp
	M			plugins/debuggercommon/stringhelpers.cpp
	M			plugins/debuggercommon/stty.cpp
	M			plugins/debuggercommon/widgets/disassemblewidget.cpp
	M			plugins/documentswitcher/documentswitcherplugin.cpp
	M			plugins/execute/projecttargetscombobox.cpp
	M			plugins/executeplasmoid/plasmoidexecutionconfig.cpp
	M			plugins/executeplasmoid/plasmoidexecutionjob.cpp
	M			plugins/filemanager/filemanager.cpp
	M			plugins/filetemplates/filetemplatesplugin.cpp
	M			plugins/filetemplates/templateclassassistant.cpp
	M			plugins/filetemplates/templateoptionspage.cpp
	M			plugins/filetemplates/templateselectionpage.cpp
	M			plugins/gdb/debugsession.cpp
	M			plugins/gdb/gdboutputwidget.cpp
	M			plugins/ghprovider/ghproviderwidget.cpp
	M			plugins/ghprovider/ghresource.cpp
	M			plugins/git/gitplugin.cpp
	M			plugins/git/gitplugincheckinrepositoryjob.cpp
	M			plugins/git/stashmanagerdialog.cpp
	M			plugins/git/stashpatchsource.cpp
	M			plugins/git/tests/test_git.cpp
	M			plugins/grepview/grepdialog.cpp
	M			plugins/grepview/grepfindthread.cpp
	M			plugins/grepview/greputil.cpp
	M			plugins/heaptrack/visualizer.cpp
	M			plugins/lldb/debugsession.cpp
	M			plugins/makebuilder/makejob.cpp
	M			plugins/ninjabuilder/ninjabuilder.cpp
	M			plugins/ninjabuilder/ninjajob.cpp
	M			plugins/okteta/oktetawidget.cpp
	M			plugins/patchreview/patchhighlighter.cpp
	M			plugins/patchreview/patchreviewtoolview.cpp
	M			plugins/perforce/perforceplugin.cpp
	M			plugins/perforce/ui/perforceimportmetadatawidget.cpp
	M			plugins/problemreporter/problemreportermodel.cpp
	M			plugins/problemreporter/problemtreeview.cpp
	M			plugins/projectfilter/filter.cpp
	M			plugins/projectfilter/projectfilterconfigpage.cpp
	M			plugins/projectmanagerview/cutcopypastehelpers.cpp
	M			plugins/projectmanagerview/projectmanagerview.cpp
	M			plugins/projectmanagerview/projectmanagerviewplugin.cpp
	M			plugins/projectmanagerview/projecttreeview.cpp
	M			plugins/qmakebuilder/qmakejob.cpp
	M			plugins/qmakemanager/qmakefilevisitor.cpp
	M			plugins/qmakemanager/qmakemanager.cpp
	M			plugins/qmakemanager/qmakeprojectfile.cpp
	M			plugins/qmljs/codecompletion/context.cpp
	M			plugins/qmljs/codecompletion/items/completionitem.cpp
	M			plugins/qmljs/codecompletion/items/functioncalltipcompletionitem.cpp
	M			plugins/qmljs/duchain/cache.cpp
	M			plugins/qmljs/duchain/declarationbuilder.cpp
	M			plugins/qmljs/duchain/frameworks/nodejs.cpp
	M			plugins/qmljs/duchain/parsesession.cpp
	M			plugins/qthelp/qthelpplugin.cpp
	M			plugins/qthelp/qthelpqtdoc.cpp
	M			plugins/quickopen/duchainitemquickopen.cpp
	M			plugins/quickopen/expandingtree/expandingtree.cpp
	M			plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
	M			plugins/quickopen/projectfilequickopen.cpp
	M			plugins/quickopen/projectitemquickopen.cpp
	M			plugins/quickopen/quickopenplugin.cpp
	M			plugins/standardoutputview/outputwidget.cpp
	M			plugins/subversion/svninternaljobbase.cpp
	M			plugins/subversion/svnssldialog.cpp
	M			plugins/vcschangesview/vcschangesview.cpp
	M			plugins/welcomepage/sessionsmodel.cpp