Diffusion KDevelop 312c3de779da

Merge remote-tracking branch 'origin/5.2'
312c3de779da
Actions

Authored by kfunk on Aug 29 2017, 8:20 PM.

Description

Merge remote-tracking branch 'origin/5.2'

Details

Committed

kfunk

Aug 29 2017, 8:20 PM

Parents

R32:c042c454b48d: Merge commit '70997d85c7fb38b08a4d74968f8eebd6940f55ca' into 5.2
R32:f5ef5b37d40b: Fix for Outoutview CmakeMultiline expression accidentally hits on CMake Error.

Branches

Unknown

Tags

Unknown

kfunk committed R32:312c3de779da: Merge remote-tracking branch 'origin/5.2' (authored by kfunk).Aug 29 2017, 8:20 PM

Merged Changes

Commit	Author	Details	Committed
c042c454b48d	kfunk	Merge commit '70997d85c7fb38b08a4d74968f8eebd6940f55ca' into 5.2	Aug 29 2017
36715f376a69	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 29 2017
e0cce205dc3b	l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 29 2017
70997d85c7fb	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 21 2017
fb704c7745b5	brauch	Set version number to 5.1.2	Aug 15 2017
a5eac48a83fc	kfunk	types: Remove unfilterable debug output	Aug 10 2017
bc748071c54b	kfunk	Fix crash in BrowseManager::avoidMenuAltFocus	Aug 10 2017
386d1a170bfe	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 10 2017
7d7c22133f0f	kfunk	Make compile on macOS	Aug 8 2017

Changes (88)

				Path	Packages
	M			analyzers/cppcheck/kdevcppcheck.json
	M			analyzers/heaptrack/kdevheaptrack.json
	M			app/kdevelop.notifyrc
	M			app/kdevelop.xml
	M			app/org.kde.kdevelop.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/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			debuggers/gdb/kdevgdb.json
	M			debuggers/lldb/kdevlldb.json
	M			documentation/manpage/kdevmanpage.json
	M			documentation/qthelp/kdevelop-qthelp.knsrc
	M			documentation/qthelp/kdevqthelp.json
	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/testing/cpp_cpputest/cpp_cpputest.desktop
	M			file_templates/testing/cpp_gtest/cpp_gtest.desktop
	M			formatters/astyle/kdevastyle.json
	M			formatters/customscript/kdevcustomscript.json
	M			kdeintegration/executeplasmoid/kdevexecuteplasmoid.json
	M			kdevplatform/language/duchain/types/typeregister.cpp
	M			kdevplatform/plugins/appwizard/kdevappwizard.json
	M			kdevplatform/plugins/appwizard/kdevappwizard.knsrc
	M			kdevplatform/plugins/bazaar/kdevbazaar.json
	M			kdevplatform/plugins/classbrowser/kdevclassbrowser.json
	M			kdevplatform/plugins/codeutils/kdevcodeutils.json
	M			kdevplatform/plugins/contextbrowser/browsemanager.cpp
	M			kdevplatform/plugins/contextbrowser/kdevcontextbrowser.json
	M			kdevplatform/plugins/cvs/kdevcvs.json
	M			kdevplatform/plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			kdevplatform/plugins/docker/kdevdocker.json
	M			kdevplatform/plugins/documentswitcher/kdevdocumentswitcher.json
	M			kdevplatform/plugins/documentview/kdevdocumentview.json
	M			kdevplatform/plugins/execute/kdevexecute.json
	M			kdevplatform/plugins/executescript/kdevexecutescript.json
	M			kdevplatform/plugins/externalscript/kdevexternalscript.json
	M			kdevplatform/plugins/filemanager/kdevfilemanager.json
	M			kdevplatform/plugins/filetemplates/kdevfiletemplates.json
	M			kdevplatform/plugins/filetemplates/kdevfiletemplates.knsrc
	M			kdevplatform/plugins/flatpak/flatpak-template/flatpak-builder-manifest.desktop
	M			kdevplatform/plugins/flatpak/kdevflatpak.json
	M			kdevplatform/plugins/genericprojectmanager/kdevgenericmanager.json
	M			kdevplatform/plugins/git/kdevgit.json
	M			kdevplatform/plugins/grepview/kdevgrepview.json
	M			kdevplatform/plugins/konsole/kdevkonsoleview.json
	M			kdevplatform/plugins/openwith/kdevopenwith.json
	M			kdevplatform/plugins/outlineview/kdevoutlineview.json
	M			kdevplatform/plugins/patchreview/kdevpatchreview.json
	M			kdevplatform/plugins/perforce/kdevperforce.json
	M			kdevplatform/plugins/problemreporter/kdevproblemreporter.json
	M			kdevplatform/plugins/projectfilter/kdevprojectfilter.json
	M			kdevplatform/plugins/projectmanagerview/kdevprojectmanagerview.json
	M			kdevplatform/plugins/quickopen/kdevquickopen.json
	M			kdevplatform/plugins/sourceformatter/kdevsourceformatter.json
	M			kdevplatform/plugins/standardoutputview/kdevstandardoutputview.json
	M			kdevplatform/plugins/subversion/kdevsubversion.json
	M			kdevplatform/plugins/subversion/kdevsvncpp/client_ls.cpp
	M			kdevplatform/plugins/switchtobuddy/kdevswitchtobuddy.json
	M			kdevplatform/plugins/testview/kdevtestview.json
	M			kdevplatform/plugins/vcschangesview/kdevvcschangesview.json
	M			kdevplatform/plugins/welcomepage/kdevwelcomepage.json
	M			languages/clang/kdevclang.xml
	M			languages/clang/kdevclangsupport.json
	M			languages/plugins/custom-definesandincludes/kdevdefinesandincludesmanager.json
	M			languages/qmljs/kdevqmljs.json
	M			org.kde.kdevelop.appdata.xml
	M			projectbuilders/cmakebuilder/kdevcmakebuilder.json
	M			projectbuilders/makebuilder/kdevmakebuilder.json
	M			projectbuilders/ninjabuilder/kdevninja.json
	M			projectbuilders/qmakebuilder/kdevqmakebuilder.json
	M			projectmanagers/cmake/kdevcmakedocumentation.json
	M			projectmanagers/cmake/kdevcmakemanager.json
	M			projectmanagers/custom-buildsystem/kcm_kdevcustombuildsystem.desktop.cmake
	M			projectmanagers/custom-buildsystem/kdevcustombuildsystem.json
	M			projectmanagers/custommake/kdevcustommakemanager.json
	M			projectmanagers/qmake/kdevqmakemanager.json
	M			providers/ghprovider/kdevghprovider.json
	M			providers/kdeprovider/kdevkdeprovider.json
	M			runtimes/android/kdevandroid.json
	M			utils/okteta/kdevokteta.json