Diffusion digiKam dbc45319bf6f

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

Authored by cgilles on Jan 12 2020, 8:06 AM.

Description

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

Details

Committed

cgilles

Jan 12 2020, 8:06 AM

Parents

R482:dd1ad64f9252: Merge branch 'master' of invent.kde.org:kde/digikam
R482:364c100a9a52: fix coding style cppcheck++

Branches

Unknown

Tags

Unknown

cgilles committed R482:dbc45319bf6f: Merge branch 'master' of invent.kde.org:kde/digikam (authored by cgilles).Jan 12 2020, 8:06 AM

Merged Changes

Commit	Author	Details	Committed
364c100a9a52	cgilles	fix coding style cppcheck++	Jan 12 2020
c010b7a5b71b	cgilles	dimg::raw => ./filters/raw dcolor => ./color	Jan 12 2020
d6d8862514d0	cgilles	build qtav from master at digiKam bundle updates, as it contains important…	Jan 12 2020
56ebf6fa6900	mqualmann	disable interaction with the image list BUGS: 416120 FIXED-IN: 7.0.0	Jan 11 2020
64f36d7df748	cgilles	fix coding style cppcheck++	Jan 11 2020
8ed03e48aeb2	mqualmann	fix order	Jan 11 2020
60e6bed45547	mqualmann	fix compile with QWebEngine	Jan 11 2020
6d3e3d0e106d	cgilles	fix coding style cppcheck++	Jan 11 2020
ea00bdd8efaa	mqualmann	disable compile WebWidget	Jan 11 2020
e1680d235374	mqualmann	port inactive Facebook plugin to the WebBrowserDlg	Jan 11 2020
e477fb0f760b	mqualmann	fix compile test	Jan 11 2020
abd2ab8d36e7	mqualmann	port active web plugins to the WebBrowserDlg fix Flickr login problem, QWebView…	Jan 11 2020
ec4389d2534c	mqualmann	use https for google maps	Jan 11 2020
5c4425703e7a	cgilles	fix coding style cppcheck++	Jan 11 2020
45db36a3ab66	cgilles	fix coding style cppcheck++	Jan 11 2020

Changes (99)

		Path
M		NEWS
M		core/data/geolocation/geoiface/backend-googlemaps.html
M		core/dplugins/generic/webservices/facebook/fbtalker.cpp
M		core/dplugins/generic/webservices/facebook/fbtalker.h
M		core/dplugins/generic/webservices/flickr/flickrtalker.cpp
M		core/dplugins/generic/webservices/google/gswindow.cpp
M		core/dplugins/generic/webservices/onedrive/odtalker.cpp
M		core/dplugins/generic/webservices/pinterest/ptalker.cpp
M		core/libs/dialogs/webbrowserdlg.cpp
M		core/libs/dialogs/webbrowserdlg.h
M		core/libs/dimg/CMakeLists.txt
A	(dir)	core/libs/dimg/color/
V		core/libs/dimg/{color ← }/dcolor.cpp
V		core/libs/dimg/{color ← }/dcolor.h
V		core/libs/dimg/{color ← }/dcolorblend.h
V		core/libs/dimg/{color ← }/dcolorcomposer.cpp
V		core/libs/dimg/{color ← }/dcolorcomposer.h
V		core/libs/dimg/{color ← }/dcolorpixelaccess.h
V		core/libs/dimg/{ → color}/dcolor.cpp
V		core/libs/dimg/{ → color}/dcolor.h
V		core/libs/dimg/{ → color}/dcolorblend.h
V		core/libs/dimg/{ → color}/dcolorcomposer.cpp
V		core/libs/dimg/{ → color}/dcolorcomposer.h
V		core/libs/dimg/{ → color}/dcolorpixelaccess.h
V		core/libs/dimg/{ → filters/raw}/drawdecoding.cpp
V		core/libs/dimg/{ → filters/raw}/drawdecoding.h
M		core/libs/dimg/filters/README
M		core/libs/dimg/filters/auto/autoexpofilter.h
M		core/libs/dimg/filters/auto/autolevelsfilter.cpp
M		core/libs/dimg/filters/auto/autolevelsfilter.h
M		core/libs/dimg/filters/auto/equalizefilter.cpp
M		core/libs/dimg/filters/auto/equalizefilter.h
M		core/libs/dimg/filters/auto/normalizefilter.cpp
M		core/libs/dimg/filters/auto/normalizefilter.h
M		core/libs/dimg/filters/auto/stretchfilter.cpp
M		core/libs/dimg/filters/auto/stretchfilter.h
M		core/libs/dimg/filters/bcg/bcgcontainer.h
M		core/libs/dimg/filters/bcg/bcgfilter.cpp
M		core/libs/dimg/filters/bcg/bcgfilter.h
M		core/libs/dimg/filters/bcg/bcgsettings.cpp
M		core/libs/dimg/filters/bcg/bcgsettings.h
M		core/libs/dimg/filters/bw/bwsepiafilter.cpp
M		core/libs/dimg/filters/bw/bwsepiafilter.h
M		core/libs/dimg/filters/bw/bwsepiasettings.cpp
M		core/libs/dimg/filters/bw/bwsepiasettings.h
M		core/libs/dimg/filters/bw/infraredfilter.cpp
M		core/libs/dimg/filters/bw/infraredfilter.h
M		core/libs/dimg/filters/bw/mixerfilter.cpp
M		core/libs/dimg/filters/bw/mixerfilter.h
M		core/libs/dimg/filters/bw/mixersettings.cpp
M		core/libs/dimg/filters/bw/mixersettings.h
M		core/libs/dimg/filters/bw/tonalityfilter.cpp
M		core/libs/dimg/filters/bw/tonalityfilter.h
M		core/libs/dimg/filters/dimgbuiltinfilter.cpp
M		core/libs/dimg/filters/dimgbuiltinfilter.h
M		core/libs/dimg/filters/dimgfiltergenerator.h
M		core/libs/dimg/filters/dimgfiltermanager.cpp
M		core/libs/dimg/filters/dimgfiltermanager.h
M		core/libs/dimg/filters/dimgthreadedanalyser.h
M		core/libs/dimg/filters/dimgthreadedfilter.cpp
M		core/libs/dimg/filters/dimgthreadedfilter.h
M		core/libs/dimg/filters/dpixelsaliasfilter.cpp
M		core/libs/dimg/filters/filteractionfilter.cpp
M		core/libs/dimg/filters/filteractionfilter.h
M		core/libs/dimg/filters/randomnumbergenerator.cpp
A	(dir)	core/libs/dimg/filters/raw/
V		core/libs/dimg/{filters/raw ← }/drawdecoding.cpp
V		core/libs/dimg/{filters/raw ← }/drawdecoding.h
V		core/libs/dimg/filters/{raw ← }/rawprocessingfilter.cpp
V		core/libs/dimg/filters/{raw ← }/rawprocessingfilter.h
V		core/libs/dimg/filters/{ → raw}/rawprocessingfilter.cpp
V		core/libs/dimg/filters/{ → raw}/rawprocessingfilter.h
M		core/libs/dimg/history/dimagehistory.cpp
M		core/libs/dimg/history/dimagehistory.h
M		core/libs/dimg/history/filteraction.cpp
M		core/libs/dimg/history/filteraction.h
M		core/libs/dimg/history/historyimageid.cpp
M		core/libs/dimg/history/historyimageid.h
M		core/libs/dimg/loaders/dimgloader.cpp
M		core/libs/dimg/loaders/dimgloader.h
M		core/libs/dimg/loaders/heifsettings.cpp
M		core/libs/dimg/loaders/heifsettings.h
M		core/libs/dimg/loaders/jp2ksettings.cpp
M		core/libs/dimg/loaders/jp2ksettings.h
M		core/libs/dimg/loaders/jpegsettings.cpp
M		core/libs/dimg/loaders/pgfsettings.cpp
M		core/libs/dimg/loaders/pgfsettings.h
M		core/libs/dimg/loaders/pngsettings.cpp
M		core/libs/dimg/loaders/tiffsettings.cpp
M		core/libs/dplugins/CMakeLists.txt
M		core/libs/transitionmngr/effectmngr_p.h
M		core/tests/dialogs/browser.cpp
M		project/bundles/3rdparty/ext_qtav/CMakeLists.txt
M		project/bundles/appimage/01-build-host.sh
M		project/bundles/appimage/03-build-digikam.sh
M		project/bundles/macports/01-build-macports.sh
M		project/bundles/macports/03-build-digikam.sh
M		project/bundles/mxe/01-build-mxe.sh
M		project/bundles/mxe/03-build-digikam.sh