Merge branch '5.3'
ace3f20bdac1
Actions

Authored by kossebau on Sep 20 2018, 2:21 PM.

Description

Merge branch '5.3'

Committed

kossebau

Sep 20 2018, 2:21 PM

Parents

Branches

Unknown

Tags

Unknown

Commit		Author	Details	Committed
fd6607d1ad04		kossebau	astyle: revert string freeze break in JSON metadata	Sep 20 2018
c33071e2f064	D15621	kossebau	Install qtlogo.svg as normal icon, so any QIconEngine can find it	Sep 20 2018
6c439f751b95		kfunk	appimage: Include qsqlite plugin in AppImage	Sep 20 2018
a0992d316631	D15532	rjvbb	[Astyle] Add Objective C to list of languages with formatters	Sep 20 2018
1233bd48fbd9		kfunk	Revert "appimage: Enable welcome page plugin"	Sep 20 2018
3077b0d67aeb		kfunk	appimage: Welcome Page plugin needs more QML mods	Sep 20 2018
378a6e02cec5	D15605	rjvbb	astyle plugin: upgrade bundled astyle copy to v3.1	Sep 20 2018
155c51137851		kfunk	appimage: Package the QtQuick.2 plugin	Sep 20 2018
e8e470d95b6b		kfunk	appimage: Better debug output	Sep 20 2018
51d5cfd866fb		kfunk	Minor: Fix compiler warning	Sep 20 2018
1053bbc2e573		kfunk	appimage: Run strip on files in bin+lib only	Sep 20 2018

				Path	Packages
	M			appimage/kdevelop-recipe-centos6.sh
	M			pics/misc/CMakeLists.txt
	V			pics/misc/{qtlogo.svg → sc-apps-qtlogo.svg}
	V			pics/misc/{sc-apps-qtlogo.svg ← qtlogo.svg}
	M			plugins/astyle/3rdparty/libastyle/ASBeautifier.cpp
	M			plugins/astyle/3rdparty/libastyle/ASEnhancer.cpp
	M			plugins/astyle/3rdparty/libastyle/ASFormatter.cpp
	M			plugins/astyle/3rdparty/libastyle/ASLocalizer.cpp
	M			plugins/astyle/3rdparty/libastyle/ASLocalizer.h
	M			plugins/astyle/3rdparty/libastyle/ASResource.cpp
	M			plugins/astyle/3rdparty/libastyle/README
	M			plugins/astyle/3rdparty/libastyle/astyle.h
	M			plugins/astyle/astyle_formatter.cpp
	M			plugins/astyle/astyle_formatter.h
	M			plugins/astyle/astyle_plugin.cpp
	M			plugins/astyle/astyle_plugin.h
	M			plugins/astyle/astyle_preferences.cpp
	M			plugins/astyle/astyle_preferences.h
	M			plugins/astyle/astyle_stringiterator.cpp
	M			plugins/astyle/astyle_stringiterator.h
	M			plugins/clang/duchain/builder.cpp