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

Authored by cgilles on Jan 11 2020, 12:47 PM.

Description

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

Committed

cgilles

Jan 11 2020, 12:47 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
e0d17dfaa049	cgilles	add QtWebEngine support	Jan 11 2020
ddd00b6839d6	cgilles	fix coding style cppcheck++	Jan 11 2020
0fdae15a19da	cgilles	fix coding style cppcheck++	Jan 11 2020
e9f746745552	cgilles	this class do not be used in the future. Mark as deprecated. QSharedData must…	Jan 11 2020

				Path	Packages
	M			core/libs/dimg/dcolor.cpp
	M			core/libs/dimg/dcolor.h
	M			core/libs/dimg/dcolorblend.h
	M			core/libs/dimg/dimg.cpp
	M			core/libs/dimg/dimg.h
	M			core/libs/dimg/dimg_bitsops.cpp
	M			core/libs/dimg/dimg_colors.cpp
	M			core/libs/dimg/dimg_copy.cpp
	M			core/libs/dimg/dimg_data.cpp
	M			core/libs/dimg/dimg_fileio.cpp
	M			core/libs/dimg/dimg_metadata.cpp
	M			core/libs/dimg/dimg_p.h
	M			core/libs/dimg/dimg_props.cpp
	M			core/libs/dimg/dimg_qimage.cpp
	M			core/libs/dimg/dimg_qpixmap.cpp
	M			core/libs/dimg/dimg_scale.cpp
	M			core/libs/dimg/dimg_transform.cpp
	M			core/libs/dimg/dshareddata.h
	M			project/bundles/macports/01-build-macports.sh
	M			project/bundles/macports/02-build-extralibs.sh
	M			project/bundles/macports/03-build-digikam.sh
	M			project/bundles/macports/04-build-installer.sh
	M			project/bundles/macports/config.sh
	M			project/bundles/mxe/config.sh