Diffusion digiKam 2385a5517212

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

Authored by cgilles on Jan 14 2020, 3:19 PM.

Description

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

Details

Committed

cgilles

Jan 14 2020, 3:19 PM

Parents

R482:5ae049eec08c: fix coding style cppcheck++
R482:6351357d7f7c: Add new QtWebEngine dependencies for 5.14.0

Branches

Unknown

Tags

Unknown

cgilles committed R482:2385a5517212: Merge branch 'master' of invent.kde.org:kde/digikam (authored by cgilles).Jan 14 2020, 3:19 PM

Merged Changes

Commit	Author	Details	Committed
6351357d7f7c	cgilles	Add new QtWebEngine dependencies for 5.14.0	Jan 14 2020
f401fa7ea24d	cgilles	fix coding style cppcheck++	Jan 14 2020
0803c92ca14d	cgilles	fix coding style cppcheck++	Jan 14 2020
9346af30fa6c	cgilles	fix coding style cppcheck++	Jan 14 2020
4f841654d182	cgilles	fix coding style cppcheck++	Jan 14 2020
1d17e816245a	mqualmann	we need the tag ID and not the image ID CCBUGS: 416213	Jan 13 2020

Changes (58)

				Path	Packages
	M			core/libs/database/coredb/coredb.cpp
	M			core/libs/widgets/graphicsview/clickdragreleaseitem.cpp
	M			core/libs/widgets/graphicsview/clickdragreleaseitem.h
	M			core/libs/widgets/graphicsview/dimgchilditem.cpp
	M			core/libs/widgets/graphicsview/dimgpreviewitem.cpp
	M			core/libs/widgets/graphicsview/dimgpreviewitem.h
	M			core/libs/widgets/graphicsview/graphicsdimgitem.cpp
	M			core/libs/widgets/graphicsview/graphicsdimgitem.h
	M			core/libs/widgets/graphicsview/graphicsdimgview.cpp
	M			core/libs/widgets/graphicsview/graphicsdimgview.h
	M			core/libs/widgets/graphicsview/imagezoomsettings.cpp
	M			core/libs/widgets/graphicsview/imagezoomsettings.h
	M			core/libs/widgets/graphicsview/itemvisibilitycontroller.cpp
	M			core/libs/widgets/graphicsview/itemvisibilitycontroller.h
	M			core/libs/widgets/graphicsview/paniconwidget.cpp
	M			core/libs/widgets/graphicsview/paniconwidget.h
	M			core/libs/widgets/graphicsview/previewlayout.cpp
	M			core/libs/widgets/graphicsview/previewlayout.h
	M			core/libs/widgets/graphicsview/regionframeitem.cpp
	M			core/libs/widgets/graphicsview/regionframeitem.h
	M			core/libs/widgets/history/filtershistorywidget.cpp
	M			core/libs/widgets/history/itemfiltershistoryitemdelegate.cpp
	M			core/libs/widgets/history/itemfiltershistoryitemdelegate.h
	M			core/libs/widgets/history/itemfiltershistorymodel.cpp
	M			core/libs/widgets/history/itemfiltershistorytreeitem.cpp
	M			core/libs/widgets/history/itemfiltershistorytreeitem.h
	M			core/libs/widgets/history/versionswidget.cpp
	M			core/libs/widgets/iccprofiles/cietonguewidget.cpp
	M			core/libs/widgets/iccprofiles/cietonguewidget.h
	M			core/libs/widgets/iccprofiles/iccprofilescombobox.cpp
	M			core/libs/widgets/iccprofiles/iccprofilescombobox.h
	M			core/libs/widgets/iccprofiles/iccprofilewidget.cpp
	M			core/libs/widgets/iccprofiles/iccprofilewidget.h
	M			core/libs/widgets/itemview/actioncategorizedview.cpp
	M			core/libs/widgets/itemview/actioncategorizedview.h
	M			core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.cpp
	M			core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h
	M			core/libs/widgets/itemview/dcategorizedsortfilterproxymodel_p.h
	M			core/libs/widgets/itemview/dcategorizedview.cpp
	M			core/libs/widgets/itemview/dcategorizedview.h
	M			core/libs/widgets/itemview/dcategorizedview_p.h
	M			core/libs/widgets/itemview/dcategorydrawer.h
	M			core/libs/widgets/itemview/ditemdelegate.cpp
	M			core/libs/widgets/itemview/ditemdelegate.h
	M			core/libs/widgets/itemview/ditemtooltip.cpp
	M			core/libs/widgets/itemview/ditemtooltip.h
	M			core/libs/widgets/itemview/itemdelegateoverlay.cpp
	M			core/libs/widgets/itemview/itemdelegateoverlay.h
	M			core/libs/widgets/itemview/itemviewcategorized.cpp
	M			core/libs/widgets/itemview/itemviewcategorized.h
	M			core/libs/widgets/itemview/itemviewdelegate.cpp
	M			core/libs/widgets/itemview/itemviewdelegate.h
	M			core/libs/widgets/itemview/itemviewdelegate_p.h
	M			core/libs/widgets/itemview/itemviewhoverbutton.cpp
	M			core/libs/widgets/itemview/itemviewhoverbutton.h
	M			core/libs/widgets/itemview/itemviewtooltip.cpp
	M			core/libs/widgets/itemview/itemviewtooltip.h
	M			project/bundles/appimage/01-build-host.sh