Merge branch '5.5'
c110d8c9ec03
Actions

Authored by mwolff on Jan 22 2020, 9:25 AM.

Description

Merge branch '5.5'

Details

Committed

mwolff

Jan 22 2020, 9:25 AM

Parents

R32:3d79085b82f7: Merge branch '5.4' into 5.5
R32:a2b252a5ee00: Bump versions for what will become 5.6 one day

Branches

Unknown

Tags

Unknown

mwolff committed R32:c110d8c9ec03: Merge branch '5.5' (authored by mwolff).Jan 22 2020, 9:25 AM

Merged Changes

Commit	Author	Details	Committed
3d79085b82f7	mwolff	Merge branch '5.4' into 5.5	Jan 22 2020
23c7fec54cc2	mwolff	Fix build against clang built from git	Jan 22 2020
f709db09071f	kossebau	vcs: remove unused variable	Jan 22 2020
d2acd785d170	kossebau	Use more const containers with range-based for loops	Jan 22 2020
f68e682b39d4	kossebau	Partially revert port from QList::toSet()	Jan 21 2020
a11207c9aeed	kossebau	Port away from deprecated QSet::fromList()	Jan 21 2020
511c8fca6458	kossebau	Set version number to 5.4.80	Jan 21 2020
ecff08c5935d	kossebau	Port away from deprecated QList::toSet()	Jan 21 2020
074c7bec05e4	kossebau	qmljs: disable Qt deprecation warnings for 3rd-party	Jan 21 2020
64bc2c90ea1a	kossebau	Port to newer qmlRegisterAnonymousType	Jan 21 2020
b5ae6cf66317	kossebau	Port away from deprecated QComboBox::activated(QString) overload	Jan 21 2020
486edef7c97e	kossebau	clazy: use consistently AE in user strings	Jan 21 2020
14a6e554c0f1	kossebau	clazy: follow properly the scheme in kcfg file, fix order	Jan 21 2020
82612026f89b	kossebau	Use more explicit	Jan 21 2020
d9c7403db956	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 21 2020
3b248ec907e2	l10n daemon script	GIT_SILENT made messages (after extraction)	Jan 21 2020

Changes (146)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			app/kdevelop.xml
	M			app/org.kde.kdevelop.desktop
	M			app/org.kde.kdevelop_kdev4.desktop
	M			app/org.kde.kdevelop_ps.desktop
	M			app/plasma/applet/package/metadata.desktop
	M			app/plasma/dataengine/plasma-dataengine-kdevelopsessions.desktop
	M			app/plasma/runner/kdevelopsessions.desktop
	M			app_templates/c/CMake/cmake_plainc/cmake_plainc.kdevtemplate
	M			app_templates/cpp/CMake/cmake_kdevplugin/cmake_kdevplugin.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate
	M			app_templates/empty/empty.kdevtemplate
	M			cmake/modules/FindClang.cmake
	M			file_templates/classes/qabstractitemmodel/qabstractitemmodel.desktop
	M			file_templates/classes/qabstractitemmodel_pimpl/qabstractitemmodel_pimpl.desktop
	M			file_templates/classes/qdialog/qdialog.desktop
	M			file_templates/classes/qdialog_pimpl/qdialog_pimpl.desktop
	M			file_templates/classes/qobject_pimpl/qobject_pimpl.desktop
	M			file_templates/classes/qt_interface/qt_interface.desktop
	M			file_templates/classes/qt_widget/qt_widget.desktop
	M			file_templates/classes/qwidget_pimpl/qwidget_pimpl.desktop
	M			file_templates/testing/cpp_cpputest/cpp_cpputest.desktop
	M			file_templates/testing/cpp_gtest/cpp_gtest.desktop
	M			kdevplatform/interfaces/kdevelopplugin.desktop
	M			kdevplatform/language/duchain/navigation/problemnavigationcontext.cpp
	M			kdevplatform/project/projectchangesmodel.cpp
	M			kdevplatform/serialization/tests/bench_itemrepository.cpp
	M			kdevplatform/shell/plugincontroller.cpp
	M			kdevplatform/shell/projectcontroller.cpp
	M			kdevplatform/shell/workingsets/workingset.cpp
	M			kdevplatform/shell/workingsets/workingset.h
	M			kdevplatform/shell/workingsets/workingsettoolbutton.cpp
	M			kdevplatform/shell/workingsets/workingsettooltipwidget.cpp
	M			kdevplatform/sublime/mainwindow_p.h
	M			kdevplatform/sublime/message.h
	M			kdevplatform/util/environmentselectionmodel.cpp
	M			kdevplatform/vcs/models/vcsfilechangesmodel.cpp
	M			kdevplatform/vcs/widgets/vcsannotationitemdelegate.cpp
	M			org.kde.kdevelop.appdata.xml
	M			plugins/android/kdevandroid.json
	M			plugins/appwizard/kdevappwizard.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/astyle/kdevastyle.json
	M			plugins/bazaar/kdevbazaar.json
	M			plugins/bazaar/org.kde.kdevelop_bzr.desktop
	M			plugins/clang/clangparsejob.cpp
	M			plugins/clang/codecompletion/context.cpp
	M			plugins/clang/duchain/documentfinderhelpers.cpp
	M			plugins/clang/duchain/parsesession.cpp
	M			plugins/clang/kdevclang.xml
	M			plugins/clang/kdevclangsupport.json
	M			plugins/clang/tests/test_duchain.cpp
	M			plugins/clangtidy/kdevclangtidy.json
	M			plugins/classbrowser/kdevclassbrowser.json
	M			plugins/clazy/config/globalsettings.kcfg
	M			plugins/clazy/config/projectconfigpage.ui
	M			plugins/clazy/kdevclazy.json
	M			plugins/clazy/utils.cpp
	M			plugins/cmake/cmakeutils.cpp
	M			plugins/cmake/duchain/usebuilder.cpp
	M			plugins/cmake/kdevcmakedocumentation.json
	M			plugins/cmake/kdevcmakemanager.json
	M			plugins/cmakebuilder/kdevcmakebuilder.json
	M			plugins/codeutils/kdevcodeutils.json
	M			plugins/contextbrowser/kdevcontextbrowser.json
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/custom-buildsystem/kdevcustombuildsystem.json
	M			plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp
	M			plugins/custom-definesandincludes/includepathsconverter.cpp
	M			plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp
	M			plugins/custom-definesandincludes/kcm_widget/projectpathswidget.cpp
	M			plugins/custom-definesandincludes/kdevdefinesandincludesmanager.json
	M			plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectincludepathsmanager.cpp
	M			plugins/custommake/kdevcustommakemanager.json
	M			plugins/customscript/kdevcustomscript.json
	M			plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			plugins/docker/kdevdocker.json
	M			plugins/documentswitcher/kdevdocumentswitcher.json
	M			plugins/documentview/kdevdocumentview.json
	M			plugins/documentview/settings/kcm_documentview_settings.desktop
	M			plugins/execute/kdevexecute.json
	M			plugins/executeplasmoid/kdevexecuteplasmoid.json
	M			plugins/executescript/kdevexecutescript.json
	M			plugins/externalscript/kdevexternalscript.json
	M			plugins/filemanager/kdevfilemanager.json
	M			plugins/filetemplates/kdevfiletemplates.json
	M			plugins/filetemplates/kdevfiletemplates.knsrc
	M			plugins/flatpak/flatpak-template/flatpak-builder-manifest.desktop
	M			plugins/flatpak/flatpakruntime.cpp
	M			plugins/flatpak/kdevflatpak.json
	M			plugins/gdb/kdevgdb.json
	M			plugins/gdb/unittests/test_gdb.cpp
	M			plugins/genericprojectmanager/kdevgenericmanager.json
	M			plugins/ghprovider/kdevghprovider.json
	M			plugins/git/kdevgit.json
	M			plugins/git/org.kde.kdevelop_git.desktop
	M			plugins/grepview/grepdialog.cpp
	M			plugins/grepview/grepfindthread.cpp
	M			plugins/grepview/kdevgrepview.json
	M			plugins/heaptrack/kdevheaptrack.json
	M			plugins/kdeprovider/kdevkdeprovider.json
	M			plugins/konsole/kdevkonsoleview.json
	M			plugins/lldb/kdevlldb.json
	M			plugins/lldb/unittests/test_lldb.cpp
	M			plugins/lldb/unittests/test_lldbformatters.cpp
	M			plugins/makebuilder/kdevmakebuilder.json
	M			plugins/manpage/kdevmanpage.json
	M			plugins/meson/kdevmesonmanager.json
	M			plugins/ninjabuilder/kdevninja.json
	M			plugins/okteta/kdevokteta.json
	M			plugins/openwith/kdevopenwith.json
	M			plugins/outlineview/kdevoutlineview.json
	M			plugins/patchreview/kdevpatchreview.json
	M			plugins/patchreview/patchreviewtoolview.cpp
	M			plugins/perforce/kdevperforce.json
	M			plugins/perforce/ui/perforceimportmetadatawidget.cpp
	M			plugins/problemreporter/kdevproblemreporter.json
	M			plugins/projectfilter/kdevprojectfilter.json
	M			plugins/projectmanagerview/cutcopypastehelpers.cpp
	M			plugins/projectmanagerview/kdevprojectmanagerview.json
	M			plugins/projectmanagerview/projectmanagerviewplugin.cpp
	M			plugins/projectmanagerview/projecttreeview.cpp
	M			plugins/qmakebuilder/kdevqmakebuilder.json
	M			plugins/qmakemanager/kdevqmakemanager.json
	M			plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt
	M			plugins/qmljs/codecompletion/items/functioncalltipcompletionitem.cpp
	M			plugins/qmljs/duchain/declarationbuilder.cpp
	M			plugins/qmljs/kdevqmljs.json
	M			plugins/qmljs/qmljsparsejob.cpp
	M			plugins/qthelp/kdevelop-qthelp.knsrc
	M			plugins/qthelp/kdevqthelp.json
	M			plugins/quickopen/kdevquickopen.json
	M			plugins/quickopen/quickopenmodel.cpp
	M			plugins/scratchpad/emptymessagelistview.h
	M			plugins/scratchpad/scratchpad.json
	M			plugins/sourceformatter/kdevsourceformatter.json
	M			plugins/standardoutputview/kdevstandardoutputview.json
	M			plugins/subversion/kdevsubversion.json
	M			plugins/subversion/org.kde.kdevelop_svn.desktop
	M			plugins/switchtobuddy/kdevswitchtobuddy.json
	M			plugins/testview/kdevtestview.json
	M			plugins/vcschangesview/kdevvcschangesview.json
	M			plugins/welcomepage/declarative/kdevelopdashboarddeclarativeplugin.cpp
	M			plugins/welcomepage/kdevwelcomepage.json