Diffusion digiKam 85475aff4909

Merge branch 'master' into 7.0.0
85475aff4909
Actions

Authored by cgilles on Sep 18 2019, 9:47 PM.

Description

Merge branch 'master' into 7.0.0

Details

Committed

cgilles

Sep 18 2019, 9:47 PM

Parents

R482:a8b6e39ab474: RAW Import tool: new plugin to import RAW files using DarkTable in Image Editor.
R482:2bd4ac12e7dc: Merge branch 'master' into 7.0.0

Branches

Unknown

Tags

Unknown

cgilles committed R482:85475aff4909: Merge branch 'master' into 7.0.0 (authored by cgilles).Sep 18 2019, 9:47 PM

Merged Changes

Commit	Author	Details	Committed
a8b6e39ab474	cgilles	RAW Import tool: new plugin to import RAW files using DarkTable in Image Editor.	Sep 18 2019
aca3a9fa0101	mqualmann	polish and fix memory leaks CCBUGS: 411612	Sep 18 2019
f163b11e8b63	cgilles	polish	Sep 18 2019
c1bda3cf9523	cgilles	RAW Import tool: new plugin to import RAW files using RawTherapee in Image…	Sep 18 2019
4bc9fc21f5bd	cgilles	polish	Sep 18 2019
9929552f45c8	mqualmann	Merge branch 'master' of invent.kde.org:kde/digikam	Sep 18 2019
d74eeab572c2	mqualmann	update	Sep 18 2019
38ea61d196a4	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Sep 18 2019
40eddc257ba8	cgilles	polish	Sep 18 2019
621fb6838a0d	mqualmann	update	Sep 18 2019
ba0d77d142d1	cgilles	saving in PNG instead TIFF, as UFRaw save multilayer tiff with first one is a…	Sep 18 2019
32d13248c166	cgilles	polish	Sep 18 2019
b9c91193e281	cgilles	polish	Sep 18 2019
6cfcfc1688f4	cgilles	Finalization of UFRaw import plugin for image editor BUGS: 15011 FIXED-IN: 6.4.0	Sep 18 2019
eb67491d77a3	cgilles	RAW Import tool : new plugin to import RAW files using Ufraw in Image Editor.	Sep 18 2019
372a705cae5c	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Sep 18 2019
abeeaeb0911b	cgilles	polish layour on settings widget	Sep 18 2019
4476eaefc207	mqualmann	fix loading the right RAW plugin	Sep 18 2019
342126c41a65	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Sep 18 2019
2606cd8a64a6	cgilles	add patch to hack UCI support under AppImage	Sep 18 2019

Changes (25)

		Path
M		NEWS
M		core/dplugins/editor/enhance/healingclone/healingclonetool.cpp
M		core/dplugins/rawimport/CMakeLists.txt
A	(dir)	core/dplugins/rawimport/darktable/
P		core/dplugins/rawimport/darktable/CMakeLists.txt Copied from core/dplugins/editor/transform/autocrop/CMakeLists.txt
A		core/dplugins/rawimport/darktable/rawimportdarktableplugin.cpp
P		core/dplugins/rawimport/darktable/rawimportdarktableplugin.h Copied from core/dplugins/rawimport/native/rawimportnativeplugin.h
A	(dir)	core/dplugins/rawimport/rawtherapee/
P		core/dplugins/rawimport/rawtherapee/CMakeLists.txt Copied from core/dplugins/bqm/decorate/border/CMakeLists.txt
A		core/dplugins/rawimport/rawtherapee/rawimportrawtherapeeplugin.cpp
P		core/dplugins/rawimport/rawtherapee/rawimportrawtherapeeplugin.h Copied from core/dplugins/rawimport/native/rawimportnativeplugin.h
A	(dir)	core/dplugins/rawimport/ufraw/
P		core/dplugins/rawimport/ufraw/CMakeLists.txt Copied from core/dplugins/editor/colors/invert/CMakeLists.txt
A		core/dplugins/rawimport/ufraw/rawimportufrawplugin.cpp
P		core/dplugins/rawimport/ufraw/rawimportufrawplugin.h Copied from core/dplugins/rawimport/native/rawimportnativeplugin.h
M		core/libs/tags/manager/models/tagmngrlistitem.cpp
M		core/libs/tags/manager/models/tagmngrlistmodel.cpp
M		core/libs/tags/manager/models/tagmngrlistview.cpp
M		core/libs/tags/manager/taglist.cpp
M		core/libs/tags/manager/tagmngrtreeview.cpp
M		core/libs/tags/manager/tagsmanager.cpp
M		core/libs/tags/manager/tagsmanager.h
M		core/utilities/imageeditor/core/editorcore.cpp
M		project/bundles/3rdparty/ext_qt/CMakeLists.txt
A		project/bundles/3rdparty/ext_qt/qt-icu-hack.patch