Diffusion digiKam 4fb7f32bfc87

Merge branch 'master' of invent.kde.org:kde/digikam
4fb7f32bfc87
Actions

Authored by cgilles on Jun 7 2019, 7:14 PM.

Description

Merge branch 'master' of invent.kde.org:kde/digikam

Details

Committed

cgilles

Jun 7 2019, 7:14 PM

Parents

R482:0e254cabd4b8: fix null pointer warnings
R482:6d951aeb2135: gitslave.bundle is empty and not used anymore

Branches

Unknown

Tags

Unknown

cgilles committed R482:4fb7f32bfc87: Merge branch 'master' of invent.kde.org:kde/digikam (authored by cgilles).Jun 7 2019, 7:14 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
6d951aeb2135	cgilles	gitslave.bundle is empty and not used anymore	Jun 7 2019
498dcc2cac95	mqualmann	QDirIterator has already a QFileInfo object	Jun 6 2019
e0919da675dc	mqualmann	use plugin list directly	Jun 6 2019
cfcbe04933b0	mqualmann	next try to fix crash at end CCBUGS: 407235	Jun 6 2019
fee4e19ba2f9	mqualmann	update	Jun 6 2019
300399fd825a	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 6 2019
66ef4e1cb97e	cgilles	remove download.repos script usage in documentation	Jun 6 2019
bba333953021	mqualmann	remove virtual	Jun 6 2019
386e39e05331	mqualmann	use static function actionForIndex()	Jun 5 2019
de05f6aaf307	mqualmann	override createFilterModel()	Jun 5 2019
a9068a8a5428	mqualmann	add ActionSortFilterProxyModel to filter out disabled actions BUGS: 408332…	Jun 5 2019
0aa0c9aae7be	cgilles	update	Jun 5 2019
9a232de0fa88	mqualmann	delete the view before the pointer is set to nullptr BUGS: 408311 CCBUGS…	Jun 4 2019
d6a94becc2f9	mqualmann	fix handling with subject matter code BUGS: 369657 FIXED-IN: 6.2.0	Jun 4 2019
0ee2862a2e0b	mqualmann	update	Jun 4 2019
31e645d7208b	mqualmann	polish	Jun 3 2019
dcd215674074	mqualmann	remove unused IPTC metadata on the XMP tab	Jun 3 2019
83445b12286d	mqualmann	fix applying the metadata on all tabs BUGS: 408261 FIXED-IN: 6.2.0	Jun 3 2019
dcfdd6f8474e	mqualmann	polish find icons	Jun 3 2019
735363cc5b48	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 3 2019
d0484a8a706f	mqualmann	try to fix missing icons from AppImage CCBUGS: 406937	Jun 2 2019
7c4cd7850a38	mqualmann	We also allow the FUSE file systems	Jun 2 2019
aed8b69fdf95	mqualmann	allow the + character in the filename only for NTFS BUGS: 408213 FIXED-IN: 6.2.0	Jun 2 2019
46b12123f138	cgilles	fix clang warnings	Jun 2 2019
4d8668f316f6	cgilles	fix clang warning	Jun 2 2019
c97022cc07ff	cgilles	fix clang warning	Jun 2 2019
7dc0ee6ccce0	cgilles	fix clang warning	Jun 2 2019
217eb846f6e0	cgilles	fix clang detection and enable no override warnings on the console	Jun 2 2019
cda8c121a662	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 2 2019
e15f245b3d6e	cgilles	fix clang warnings about deprecated OpenGL API under MacOS 10.14, in favor to…	Jun 2 2019
1fc09c6422f6	mqualmann	polish	Jun 2 2019
0f624fd11afb	mqualmann	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 2 2019
43ec1a2afd86	mqualmann	increase the control points	Jun 2 2019
8527cc24697d	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 2 2019
7d5a679a53bf	cgilles	Fix clang warnings introduced from lcms2 hearders used by libraw	Jun 2 2019
5f3b141d3e35	mqualmann	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 2 2019
be97222a9c76	mqualmann	polish	Jun 2 2019
1357ea9c144b	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 2 2019
5295395b1cae	cgilles	Fix Clang warnings about capitalized path used to include Solid headers. This…	Jun 2 2019
8392207adf01	mqualmann	polish debug	Jun 2 2019
73cc647d9949	mqualmann	polish	Jun 2 2019
adbb04d49cc1	mqualmann	check align process return code before	Jun 2 2019
1693cc4edac4	mqualmann	add error message if the alignment of the images fails	Jun 2 2019
8f579f15db0e	cgilles	polish	Jun 2 2019
d8fa62d920fb	cgilles	update	Jun 2 2019
7d7a2e20ca93	mqualmann	update enfuse download link	Jun 1 2019
b67c8607f7f6	cgilles	fix CLang warnings	Jun 1 2019
a67658f0c6ae	cgilles	fix clang warnings	Jun 1 2019
509d77afdcc3	cgilles	fix clang warning	Jun 1 2019
b404d4bed2a7	cgilles	reduce Clang warnings about override methods	Jun 1 2019

Changes (70)

				Path	Packages
	D			.gitslave.bundle
	M			Mainpage.dox
	M			NEWS
	M			bootstrap.linux
	M			bootstrap.macports
	M			core/CMakeLists.txt
	M			core/app/items/delegate/itemdelegate.cpp
	M			core/app/items/utils/contextmenuhelper.cpp
	M			core/app/items/utils/contextmenuhelper.h
	M			core/app/items/utils/itemviewutilities.cpp
	M			core/app/items/utils/tooltipfiller.cpp
	M			core/app/main/digikamapp.h
	M			core/app/main/digikamapp_camera.cpp
	M			core/app/main/digikamapp_solid.cpp
	M			core/app/main/org.kde.digikam.appdata.xml
	M			core/app/views/preview/itempreviewview.cpp
	M			core/dplugins/editor/enhance/hotpixels/hotpixelfixer.cpp
	M			core/dplugins/generic/import/dscanner/saveimgthread.cpp
	M			core/dplugins/generic/metadata/geolocationedit/dialog/geolocationedit.cpp
	M			core/dplugins/generic/metadata/metadataedit/dialog/metadataedit.cpp
	M			core/dplugins/generic/metadata/metadataedit/exif/exifeditwidget.cpp
	M			core/dplugins/generic/metadata/metadataedit/iptc/iptceditwidget.cpp
	M			core/dplugins/generic/metadata/metadataedit/iptc/iptcsubjects.cpp
	M			core/dplugins/generic/metadata/metadataedit/xmp/xmpeditwidget.cpp
	M			core/dplugins/generic/metadata/metadataedit/xmp/xmpsubjects.cpp
	M			core/dplugins/generic/tools/expoblending/manager/enfusebinary.h
	M			core/dplugins/generic/tools/expoblending/manager/expoblendingthread.cpp
	M			core/dplugins/generic/tools/mediaserver/CMakeLists.txt
	M			core/dplugins/generic/view/glviewer/CMakeLists.txt
	M			core/dplugins/generic/view/presentation/CMakeLists.txt
	M			core/libs/database/collection/collectionmanager_p.h
	M			core/libs/database/coredb/coredbschemaupdater.cpp
	M			core/libs/database/models/itemsortsettings.cpp
	M			core/libs/dplugins/setup/dpluginloader.cpp
	M			core/libs/dplugins/setup/dpluginloader_p.cpp
	M			core/libs/dplugins/webservices/o2/src/o2replyserver.cpp
	M			core/libs/facesengine/CMakeLists.txt
	M			core/libs/metadataengine/CMakeLists.txt
	M			core/libs/metadataengine/engine/metaengine_exif.cpp
	M			core/libs/metadataengine/engine/metaengine_fileio.cpp
	M			core/libs/metadataengine/engine/metaengine_p.cpp
	M			core/libs/metadataengine/engine/metaengine_p.h
	M			core/libs/metadataengine/engine/metaengine_previews.cpp
	M			core/libs/metadataengine/engine/metaengine_xmp.cpp
	M			core/libs/models/categorizeditemmodel.cpp
	M			core/libs/models/categorizeditemmodel.h
	M			core/libs/properties/history/versionsdelegate.cpp
	M			core/libs/rawengine/drawdecoder_p.h
	M			core/libs/template/subjectedit.cpp
	M			core/libs/threadimageio/video/videostripfilter.cpp
	M			core/libs/transitionmngr/transitionmngr_p_blur.cpp
	M			core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.cpp
	M			core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h
	M			core/libs/widgets/mainview/dxmlguiwindow.cpp
	M			core/libs/widgets/metadata/subjectwidget.cpp
	M			core/libs/widgets/metadata/subjectwidget.h
	M			core/showfoto/main/org.kde.showfoto.appdata.xml
	M			core/showfoto/thumbbar/showfotodelegate.cpp
	M			core/tests/video/qtavcodecs.cpp
	M			core/utilities/advancedrename/advancedrenamemanager.cpp
	M			core/utilities/facemanagement/facepipeline.cpp
	M			core/utilities/geolocation/geoiface/dragdrop/mapdragdrophandler.cpp
	M			core/utilities/imageeditor/widgets/imageregionwidget.cpp
	M			core/utilities/import/backend/umscamera.cpp
	M			core/utilities/import/items/importdelegate.cpp
	M			core/utilities/import/items/importtooltipfiller.cpp
	M			core/utilities/import/main/importui.cpp
	M			project/bundles/appimage/03-build-digikam.sh
	M			project/bundles/macports/03-build-digikam.sh
	M			project/bundles/mxe/03-build-digikam.sh