[digikam] [Bug 416704] Port digiKam to Qt6 and KF6 API.

bugzilla_noreply Thu, 03 Feb 2022 01:37:41 -0800

https://bugs.kde.org/show_bug.cgi?id=416704


--- Comment #4 from caulier.gil...@gmail.com ---
The Qt6 port of digiKam have been done by Anjani while summer 2021 in a
dedicated branch "gsoc21-qt6-port" :

https://invent.kde.org/graphics/digikam/-/tree/gsoc21-qt6-port/

Sync code from this branch with git/master give conflicts:

bash-3.2$ git merge master
Removing project/bundles/mxe/icon-rcc/main.cpp
Removing project/bundles/macports/installer/digikam.pkgproj
Removing project/bundles/macports/icon-rcc/main.cpp
Removing project/bundles/macports/icon-rcc/CMakeLists.txt
Removing project/bundles/appimage/icon-rcc/main.cpp
Removing project/bundles/appimage/icon-rcc/CMakeLists.txt
Auto-merging project/bundles/appimage/config.sh
CONFLICT (content): Merge conflict in project/bundles/appimage/config.sh
Auto-merging project/bundles/appimage/01-build-host.sh
CONFLICT (add/add): Merge conflict in
project/bundles/3rdparty/ext_qt/6.2/CMakeLists.txt
Auto-merging project/bundles/3rdparty/ext_qt/6.2/CMakeLists.txt
Removing project/bundles/3rdparty/ext_qt/5.14/qt-fix-jp2handler.patch
Removing project/bundles/3rdparty/ext_qt/5.14/qt-appimage-support.patch
Removing project/bundles/3rdparty/ext_qt/5.14/CMakeLists.txt
Auto-merging project/bundles/3rdparty/ext_libicu/CMakeLists.txt
Removing
project/bundles/3rdparty/ext_kf5_frameworks/kguiaddons-drop-wayland.patch
Removing project/bundles/3rdparty/ext_kf5_frameworks/karchive-drop-zstd.patch
Removing
project/bundles/3rdparty/ext_kf5_frameworks/breeze-icons-drop-svg.patch
Auto-merging project/bundles/3rdparty/ext_cmake/CMakeLists.txt
CONFLICT (content): Merge conflict in
project/bundles/3rdparty/ext_cmake/CMakeLists.txt
Auto-merging core/utilities/setup/downloader/filesdownloader.cpp
Auto-merging core/utilities/setup/collections/setupcollectionview.cpp
Auto-merging core/utilities/setup/collections/dwitemdelegatepool.cpp
Auto-merging core/utilities/setup/camera/importfilterdlg.cpp
Auto-merging core/utilities/setup/camera/cameralist.cpp
Auto-merging core/utilities/setup/CMakeLists.txt
Auto-merging core/utilities/searchwindow/searchgroup.cpp
Auto-merging core/utilities/searchwindow/searchfields.cpp
Auto-merging core/utilities/searchwindow/searchfieldgroup.cpp
Auto-merging core/utilities/searchwindow/CMakeLists.txt
Auto-merging core/utilities/queuemanager/views/workflowdlg.cpp
Auto-merging core/utilities/queuemanager/manager/workflowmanager.cpp
Auto-merging core/utilities/queuemanager/manager/batchtoolsfactory.cpp
Auto-merging core/utilities/queuemanager/dplugins/dpluginbqm.cpp
Auto-merging core/utilities/queuemanager/CMakeLists.txt
Auto-merging core/utilities/maintenance/maintenancesettings.cpp
CONFLICT (content): Merge conflict in
core/utilities/maintenance/maintenancesettings.cpp
Auto-merging core/utilities/maintenance/facesdetector.cpp
Auto-merging core/utilities/maintenance/databasetask.cpp
Auto-merging core/utilities/maintenance/CMakeLists.txt
Auto-merging core/utilities/lighttable/CMakeLists.txt
Auto-merging core/utilities/import/views/importview.cpp
Auto-merging core/utilities/import/main/importui.cpp
Auto-merging core/utilities/import/dialogs/camerafolderdialog.cpp
Auto-merging core/utilities/import/backend/cameracontroller.cpp
Auto-merging core/utilities/import/CMakeLists.txt
Auto-merging core/utilities/imageeditor/widgets/previewtoolbar.cpp
Auto-merging core/utilities/imageeditor/editor/editorwindow.cpp
Auto-merging core/utilities/imageeditor/CMakeLists.txt
Auto-merging core/utilities/geolocation/mapsearches/gpssearchview.cpp
Auto-merging core/utilities/geolocation/mapsearches/CMakeLists.txt
Auto-merging core/utilities/geolocation/geomapwrapper/CMakeLists.txt
Auto-merging core/utilities/geolocation/geoiface/widgets/mapwidget.cpp
Auto-merging core/utilities/geolocation/geoiface/tracks/trackmanager.cpp
Auto-merging
core/utilities/geolocation/geoiface/lookup/lookupaltitudegeonames.cpp
Auto-merging core/utilities/geolocation/geoiface/backends/backendgooglemaps.cpp
CONFLICT (content): Merge conflict in
core/utilities/geolocation/geoiface/backends/backendgooglemaps.cpp
Auto-merging core/utilities/geolocation/geoiface/CMakeLists.txt
Auto-merging core/utilities/fuzzysearch/sketchwidget.cpp
Auto-merging core/utilities/fuzzysearch/fuzzysearchview.cpp
Auto-merging core/utilities/fuzzysearch/CMakeLists.txt
Auto-merging core/utilities/firstrun/CMakeLists.txt
Auto-merging core/utilities/facemanagement/items/facegroup.cpp
Auto-merging core/utilities/facemanagement/database/faceutils.cpp
Auto-merging core/utilities/facemanagement/bench/recognitionbenchmarker.cpp
Auto-merging core/utilities/facemanagement/bench/detectionbenchmarker.cpp
Auto-merging core/utilities/facemanagement/CMakeLists.txt
Auto-merging core/utilities/extrasupport/filesindexer/CMakeLists.txt
Auto-merging core/utilities/extrasupport/addressbook/CMakeLists.txt
Auto-merging core/utilities/advancedrename/advancedrenamemanager.cpp
Auto-merging core/utilities/advancedrename/CMakeLists.txt
Auto-merging core/utilities/CMakeLists.txt
Auto-merging core/tests/widgets/CMakeLists.txt
Auto-merging core/tests/video/CMakeLists.txt
Auto-merging core/tests/timestampupdate/CMakeLists.txt
Auto-merging core/tests/multithreading/processordlg.cpp
Auto-merging core/tests/miscs/browser_gui.cpp
Auto-merging core/tests/miscs/CMakeLists.txt
Auto-merging core/tests/metadataengine/printtagslist_utest.cpp
Auto-merging core/tests/metadataengine/printmetadata_utest.cpp
Auto-merging core/tests/metadataengine/metareaderthread_utest.cpp
Auto-merging core/tests/metadataengine/exiftool/exiftooltagsdb_cli.cpp
Auto-merging core/tests/metadataengine/exiftool/exiftooloutput_cli.cpp
Auto-merging core/tests/metadataengine/exiftool/exiftoolmulticore_cli.cpp
Auto-merging core/tests/metadataengine/dmetadataloader_cli.cpp
Auto-merging core/tests/metadataengine/CMakeLists.txt
Auto-merging core/tests/mediawiki/fakeserver/fakeserver.cpp
Removing core/tests/imgqsort/imgqsorttest.cpp
Removing core/tests/imgqsort/data/test_noised_3.jpg
Auto-merging core/tests/imgqsort/CMakeLists.txt
Auto-merging core/tests/filters/CMakeLists.txt
Auto-merging core/tests/fileio/CMakeLists.txt
CONFLICT (content): Merge conflict in core/tests/fileio/CMakeLists.txt
Auto-merging core/tests/facesengine/recognition/traindb_cli.cpp
Auto-merging core/tests/facesengine/recognition/recognition_gui.cpp
Auto-merging core/tests/facesengine/recognition/benchmark_recognition_cli.cpp
Auto-merging core/tests/facesengine/demo/demomainwindow.cpp
Auto-merging core/tests/dngwriter/dnginfo_cli.cpp
Auto-merging core/tests/dimg/CMakeLists.txt
Removing core/tests/database/tagscachetest.cpp
Auto-merging core/tests/database/CMakeLists.txt
Auto-merging core/tests/albummodel/CMakeLists.txt
Auto-merging core/tests/advancedrename/CMakeLists.txt
Auto-merging core/tests/CMakeLists.txt
Auto-merging core/showfoto/thumbbar/showfotoitemmodel.cpp
Auto-merging core/showfoto/thumbbar/showfotoiteminfo.cpp
CONFLICT (content): Merge conflict in
core/showfoto/thumbbar/showfotoiteminfo.cpp
Auto-merging core/showfoto/CMakeLists.txt
Auto-merging core/libs/widgets/metadata/utils/subjectwidget.cpp
Auto-merging core/libs/widgets/mainview/dxmlguiwindow.cpp
CONFLICT (content): Merge conflict in
core/libs/widgets/mainview/dxmlguiwindow.cpp
Auto-merging core/libs/widgets/layout/sidebar.cpp
Auto-merging core/libs/widgets/layout/dexpanderbox.cpp
Auto-merging core/libs/widgets/itemview/itemviewcategorized.cpp
Auto-merging core/libs/widgets/graphicsview/itemvisibilitycontroller.cpp
Auto-merging core/libs/widgets/graphicsview/graphicsdimgview.cpp
Auto-merging core/libs/widgets/files/filesaveconflictbox.cpp
Auto-merging core/libs/widgets/files/dbinaryiface.cpp
Auto-merging core/libs/widgets/CMakeLists.txt
Auto-merging core/libs/video/CMakeLists.txt
CONFLICT (content): Merge conflict in core/libs/video/CMakeLists.txt
Auto-merging core/libs/versionmanager/CMakeLists.txt
Auto-merging core/libs/transitionmngr/transitionmngr_p_lines.cpp
Auto-merging core/libs/transitionmngr/transitionmngr_p_abstract.cpp
Auto-merging core/libs/transitionmngr/transitionmngr_p.h
Auto-merging core/libs/transitionmngr/transitionmngr_p.cpp
Auto-merging core/libs/transitionmngr/transitionmngr.cpp
Auto-merging core/libs/transitionmngr/effectmngr_p.cpp
Auto-merging core/libs/transitionmngr/effectmngr.cpp
Auto-merging core/libs/transitionmngr/CMakeLists.txt
Auto-merging core/libs/timeadjust/timeadjustcontainer.cpp
Auto-merging core/libs/timeadjust/CMakeLists.txt
Auto-merging core/libs/threads/CMakeLists.txt
Auto-merging core/libs/threadimageio/thumb/thumbnailcreator_engine.cpp
Auto-merging core/libs/threadimageio/fileio/loadsavethread.cpp
Auto-merging core/libs/threadimageio/engine/dservicemenu_linux.cpp
Auto-merging core/libs/threadimageio/engine/dfileoperations.cpp
Auto-merging core/libs/threadimageio/CMakeLists.txt
Auto-merging core/libs/template/templatepanel.cpp
Auto-merging core/libs/template/templatemanager.cpp
Auto-merging core/libs/template/subjectedit.cpp
Auto-merging core/libs/template/CMakeLists.txt
Auto-merging core/libs/tags/widgets/tagspopupmenu.cpp
Auto-merging core/libs/tags/widgets/tagfolderview.cpp
Auto-merging core/libs/tags/widgets/tageditdlg.cpp
Auto-merging core/libs/tags/CMakeLists.txt
Auto-merging core/libs/settings/CMakeLists.txt
Auto-merging core/libs/rawengine/drawdecodersettings.cpp
Auto-merging core/libs/properties/itempropertiestab.cpp
Auto-merging core/libs/properties/itempropertiessidebardb.cpp
Auto-merging core/libs/properties/captions/itemdescedittab.cpp
Auto-merging core/libs/properties/CMakeLists.txt
Auto-merging core/libs/progressmanager/CMakeLists.txt
Auto-merging core/libs/pgfutils/CMakeLists.txt
Auto-merging core/libs/onlineversion/CMakeLists.txt
Auto-merging core/libs/notificationmanager/dnotificationpopup.cpp
Auto-merging core/libs/notificationmanager/CMakeLists.txt
Auto-merging core/libs/models/albumfiltermodel.cpp
Auto-merging core/libs/models/abstractalbummodel.cpp
Auto-merging core/libs/models/CMakeLists.txt
Auto-merging core/libs/metadataengine/exiftool/exiftoolparser_output.cpp
Auto-merging core/libs/metadataengine/exiftool/exiftoolparser_command.cpp
Auto-merging core/libs/metadataengine/engine/metaengine_rotation.h
Auto-merging core/libs/metadataengine/engine/metaengine_rotation.cpp
Auto-merging core/libs/metadataengine/engine/metaengine_p.cpp
Auto-merging core/libs/metadataengine/engine/metaengine_exif.cpp
Auto-merging core/libs/metadataengine/engine/metaengine.h
Auto-merging core/libs/metadataengine/dmetadata/dmetadata_generic.cpp
Auto-merging core/libs/metadataengine/CMakeLists.txt
Auto-merging core/libs/kmemoryinfo/CMakeLists.txt
Auto-merging core/libs/jpegutils/jpegutils.cpp
Auto-merging core/libs/jpegutils/CMakeLists.txt
Auto-merging core/libs/filters/CMakeLists.txt
Auto-merging core/libs/fileactionmanager/metadatahub.cpp
Auto-merging core/libs/fileactionmanager/CMakeLists.txt
Auto-merging core/libs/facesengine/recognition/facialrecognition_wrapper_p.h
Auto-merging core/libs/facesengine/recognition/facialrecognition_wrapper_p.cpp
Auto-merging
core/libs/facesengine/recognition/facialrecognition_wrapper_identity.cpp
Auto-merging core/libs/facesengine/recognition/facialrecognition_wrapper.h
Auto-merging core/libs/facesengine/facedb/facedb_identity.cpp
Auto-merging core/libs/facesengine/common/identity.h
Auto-merging core/libs/facesengine/common/identity.cpp
Auto-merging core/libs/dtrash/dtrash.cpp
Auto-merging core/libs/dragdrop/CMakeLists.txt
Auto-merging core/libs/dplugins/widgets/ditemslist.cpp
CONFLICT (content): Merge conflict in core/libs/dplugins/widgets/ditemslist.cpp
Auto-merging core/libs/dplugins/webservices/o2/src/o1.cpp
Auto-merging core/libs/dplugins/setup/dpluginloader_p.cpp
Auto-merging core/libs/dplugins/setup/dpluginloader.cpp
Auto-merging core/libs/dplugins/setup/dpluginconfview.cpp
Auto-merging core/libs/dplugins/core/dplugingeneric.cpp
Auto-merging core/libs/dplugins/core/dplugineditor.cpp
Auto-merging core/libs/dplugins/CMakeLists.txt
Auto-merging core/libs/dimg/filters/wb/wbsettings.cpp
Auto-merging core/libs/dimg/filters/transform/autocrop.cpp
Auto-merging core/libs/dimg/filters/lens/lensfuniface.cpp
Auto-merging core/libs/dimg/filters/lc/localcontrastsettings.cpp
Removing core/libs/dimg/filters/imgqsort/imagequalityparser_noise.cpp
Removing core/libs/dimg/filters/imgqsort/imagequalityparser_exposure.cpp
Removing core/libs/dimg/filters/imgqsort/imagequalityparser_compression.cpp
Removing core/libs/dimg/filters/imgqsort/imagequalityparser_blur.cpp
Auto-merging core/libs/dimg/filters/imgqsort/imagequalitycontainer.cpp
CONFLICT (content): Merge conflict in
core/libs/dimg/filters/imgqsort/imagequalitycontainer.cpp
Auto-merging core/libs/dimg/filters/icc/iccsettings.cpp
Auto-merging core/libs/dimg/filters/icc/iccprofile.cpp
Auto-merging core/libs/dimg/filters/hotpixels/hotpixelprops.cpp
Auto-merging core/libs/dimg/filters/hotpixels/hotpixelfixer.cpp
Auto-merging core/libs/dimg/filters/decorate/borderfilter.cpp
Auto-merging core/libs/dimg/filters/curves/curvessettings.cpp
Auto-merging core/libs/dimg/CMakeLists.txt
Auto-merging core/libs/dialogs/libsinfodlg.cpp
CONFLICT (content): Merge conflict in core/libs/dialogs/libsinfodlg.cpp
Auto-merging core/libs/dialogs/dconfigdlgwidgets.h
Auto-merging core/libs/dialogs/dconfigdlgwidgets.cpp
Auto-merging core/libs/dialogs/CMakeLists.txt
Auto-merging core/libs/database/utils/widgets/dbsettingswidget.cpp
Auto-merging core/libs/database/thumbsdb/thumbsdb.cpp
Auto-merging core/libs/database/tags/tagscache.cpp
CONFLICT (content): Merge conflict in core/libs/database/tags/tagscache.cpp
Auto-merging core/libs/database/tags/facetags.h
Auto-merging core/libs/database/tags/facetags.cpp
CONFLICT (content): Merge conflict in core/libs/database/tags/facetags.cpp
Auto-merging core/libs/database/server/databaseserver.cpp
CONFLICT (content): Merge conflict in
core/libs/database/server/databaseserver.cpp
Auto-merging core/libs/database/models/itemmodel.cpp
Auto-merging core/libs/database/models/itemfiltersettings.cpp
Auto-merging core/libs/database/item/scanner/itemscanner_photo.cpp
CONFLICT (content): Merge conflict in
core/libs/database/item/scanner/itemscanner_photo.cpp
Auto-merging core/libs/database/item/query/itemqueryposthooks.cpp
Auto-merging core/libs/database/item/query/itemquerybuilder.cpp
Auto-merging core/libs/database/item/query/fieldquerybuilder.cpp
Auto-merging core/libs/database/item/lister/itemlister_salbum.cpp
Auto-merging core/libs/database/item/lister/itemlister_p.h
Auto-merging core/libs/database/item/lister/itemlister.cpp
Auto-merging core/libs/database/item/containers/itemextendedproperties.cpp
Auto-merging core/libs/database/item/containers/itemcopyright.cpp
Auto-merging core/libs/database/history/itemhistorygraphmodel.cpp
Auto-merging core/libs/database/haar/haariface.cpp
CONFLICT (content): Merge conflict in core/libs/database/haar/haariface.cpp
Auto-merging core/libs/database/engine/dbengineparameters.cpp
Auto-merging core/libs/database/engine/dbenginebackend.h
Auto-merging core/libs/database/engine/dbenginebackend.cpp
Auto-merging core/libs/database/dbjobs/dbjobsthread.cpp
Auto-merging core/libs/database/coredb/coredbsearchxml.cpp
Auto-merging core/libs/database/coredb/coredbschemaupdater.cpp
Auto-merging core/libs/database/coredb/coredbnamefilter.h
Auto-merging core/libs/database/coredb/coredbnamefilter.cpp
Auto-merging core/libs/database/coredb/coredb.cpp
Auto-merging core/libs/database/collection/collectionscanner_utils.cpp
Auto-merging core/libs/database/collection/collectionscanner_scan.cpp
Auto-merging core/libs/database/collection/collectionmanager_location.cpp
Auto-merging core/libs/database/CMakeLists.txt
Auto-merging core/libs/album/widgets/albumpropsedit.cpp
CONFLICT (content): Merge conflict in
core/libs/album/widgets/albumpropsedit.cpp
Auto-merging core/libs/album/manager/albummanager_p.h
Auto-merging core/libs/album/manager/albummanager_database.cpp
Auto-merging core/libs/album/manager/albummanager.cpp
Auto-merging core/libs/album/CMakeLists.txt
Auto-merging core/dplugins/rawimport/ufraw/rawimportufrawplugin.cpp
Auto-merging core/dplugins/rawimport/ufraw/CMakeLists.txt
Auto-merging core/dplugins/rawimport/rawtherapee/rawimportrawtherapeeplugin.cpp
Auto-merging core/dplugins/rawimport/rawtherapee/CMakeLists.txt
Auto-merging core/dplugins/rawimport/native/CMakeLists.txt
Auto-merging core/dplugins/rawimport/darktable/rawimportdarktableplugin.cpp
Auto-merging core/dplugins/rawimport/darktable/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/yandexfotki/CMakeLists.txt
Auto-merging
core/dplugins/generic/webservices/vkontakte/backend/vkontakte_authenticationdialog.cpp
Auto-merging
core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_messageinfo.cpp
Auto-merging
core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_discussionslistjob.cpp
Auto-merging
core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_allmessageslistjob.cpp
Auto-merging core/dplugins/generic/webservices/vkontakte/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/twitter/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/smugmug/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/rajce/rajcewidget.cpp
Auto-merging core/dplugins/generic/webservices/rajce/rajcetalker.cpp
Auto-merging core/dplugins/generic/webservices/rajce/rajcecommand.cpp
Auto-merging core/dplugins/generic/webservices/piwigo/piwigotalker.cpp
Auto-merging core/dplugins/generic/webservices/piwigo/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/pinterest/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/onedrive/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/mediawiki/mediawikiwidget.cpp
Auto-merging core/dplugins/generic/webservices/mediawiki/mediawikitalker.cpp
Auto-merging
core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryinfo.cpp
Auto-merging core/dplugins/generic/webservices/mediawiki/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/inaturalist/inatwindow.cpp
Auto-merging core/dplugins/generic/webservices/imgur/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/imageshack/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/google/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/flickr/flickrwindow.cpp
Auto-merging core/dplugins/generic/webservices/flickr/flickrtalker.cpp
Auto-merging core/dplugins/generic/webservices/flickr/flickrlist.cpp
Auto-merging core/dplugins/generic/webservices/flickr/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/filetransfer/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/filecopy/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/dropbox/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/box/CMakeLists.txt
Auto-merging core/dplugins/generic/webservices/CMakeLists.txt
Auto-merging core/dplugins/generic/view/slideshow/common/slideshowsettings.cpp
Auto-merging
core/dplugins/generic/view/presentation/widgets/presentationwidget.h
Auto-merging
core/dplugins/generic/view/presentation/widgets/presentationwidget.cpp
Auto-merging core/dplugins/generic/view/presentation/presentationmngr.cpp
Auto-merging core/dplugins/generic/view/presentation/opengl/presentationkb_p.h
Auto-merging core/dplugins/generic/view/presentation/opengl/presentationkb.h
Auto-merging core/dplugins/generic/view/presentation/opengl/presentationkb.cpp
Auto-merging core/dplugins/generic/view/presentation/opengl/presentationgl.h
Auto-merging core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
Auto-merging core/dplugins/generic/view/presentation/opengl/kbeffect.cpp
Auto-merging
core/dplugins/generic/view/presentation/dialogs/presentation_mainpage.cpp
Auto-merging
core/dplugins/generic/view/presentation/audio/presentation_audiopage.cpp
Auto-merging core/dplugins/generic/view/glviewer/glviewerwidget.cpp
Auto-merging core/dplugins/generic/tools/wallpaper/CMakeLists.txt
Auto-merging core/dplugins/generic/tools/sendbymail/manager/mailprocess.cpp
Auto-merging core/dplugins/generic/tools/printcreator/wizard/advprintwizard.cpp
Auto-merging
core/dplugins/generic/tools/printcreator/wizard/advprintphotopage.cpp
CONFLICT (content): Merge conflict in
core/dplugins/generic/tools/printcreator/wizard/advprintphotopage.cpp
Auto-merging
core/dplugins/generic/tools/printcreator/wizard/advprintfinalpage.cpp
Auto-merging
core/dplugins/generic/tools/printcreator/wizard/advprintcropframe.cpp
Auto-merging core/dplugins/generic/tools/printcreator/manager/advprinttask.cpp
Auto-merging core/dplugins/generic/tools/printcreator/manager/advprintphoto.h
Auto-merging core/dplugins/generic/tools/printcreator/manager/advprintphoto.cpp
Auto-merging core/dplugins/generic/tools/mjpegstream/mjpegservermngr.cpp
Auto-merging
core/dplugins/generic/tools/mediaserver/server/dmediaservermngr.cpp
Auto-merging core/dplugins/generic/tools/mediaserver/CMakeLists.txt
Auto-merging core/dplugins/generic/tools/htmlgallery/wizard/htmlfinalpage.cpp
Auto-merging
core/dplugins/generic/tools/htmlgallery/generator/gallerygenerator.cpp
Auto-merging
core/dplugins/generic/tools/htmlgallery/generator/galleryelementfunctor.cpp
Auto-merging
core/dplugins/generic/tools/expoblending/manager/expoblendingthread.cpp
Auto-merging core/dplugins/generic/tools/dngconverter/CMakeLists.txt
Auto-merging core/dplugins/generic/tools/calendar/wizard/calwizard.cpp
Auto-merging core/dplugins/generic/tools/calendar/print/calsettings.cpp
Auto-merging core/dplugins/generic/metadata/timeadjust/CMakeLists.txt
Auto-merging core/dplugins/generic/metadata/metadataedit/xmp/xmpsubjects.cpp
Auto-merging core/dplugins/generic/metadata/metadataedit/exif/exifdevice.cpp
Auto-merging core/dplugins/generic/metadata/metadataedit/exif/exifcaption.cpp
Auto-merging
core/dplugins/generic/metadata/geolocationedit/kmlexport/kmlexport.cpp
Auto-merging core/dplugins/generic/import/dscanner/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/shear/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/resize/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/ratiocrop/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/perspective/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/freerotation/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/contentawareresize/CMakeLists.txt
Auto-merging core/dplugins/editor/transform/autocrop/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/raindrop/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/oilpaint/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/filmgrain/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/emboss/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/distortionfx/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/colorfx/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/charcoal/CMakeLists.txt
Auto-merging core/dplugins/editor/filters/blurfx/CMakeLists.txt
Auto-merging core/dplugins/editor/file/print/printhelper.cpp
Auto-merging core/dplugins/editor/file/print/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/sharpen/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/restoration/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/redeye/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/noisereduction/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/localcontrast/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/lensdistortion/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/lensautofix/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/hotpixels/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/healingclone/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/blur/CMakeLists.txt
Auto-merging core/dplugins/editor/enhance/antivignetting/CMakeLists.txt
Auto-merging core/dplugins/editor/decorate/texture/CMakeLists.txt
Auto-merging core/dplugins/editor/decorate/inserttext/CMakeLists.txt
Auto-merging core/dplugins/editor/decorate/border/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/whitebalance/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/profileconversion/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/invert/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/hsl/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/film/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/convert8to16/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/convert16to8/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/colorbalance/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/channelmixer/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/bwsepia/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/bcg/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/autocorrection/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/adjustlevels/CMakeLists.txt
Auto-merging core/dplugins/editor/colors/adjustcurves/CMakeLists.txt
Auto-merging core/dplugins/dimg/tiff/dimgtiffloader_load.cpp
Auto-merging core/dplugins/dimg/tiff/CMakeLists.txt
Auto-merging core/dplugins/dimg/raw/CMakeLists.txt
Auto-merging core/dplugins/dimg/qimage/CMakeLists.txt
Auto-merging core/dplugins/dimg/png/CMakeLists.txt
Auto-merging core/dplugins/dimg/pgf/CMakeLists.txt
Auto-merging core/dplugins/dimg/jpeg2000/CMakeLists.txt
Auto-merging core/dplugins/dimg/jpeg/CMakeLists.txt
Auto-merging core/dplugins/dimg/imagemagick/CMakeLists.txt
Auto-merging core/dplugins/dimg/heif/CMakeLists.txt
Auto-merging core/dplugins/bqm/transform/rotate/CMakeLists.txt
Auto-merging core/dplugins/bqm/transform/resize/CMakeLists.txt
Auto-merging core/dplugins/bqm/transform/flip/CMakeLists.txt
Auto-merging core/dplugins/bqm/transform/crop/CMakeLists.txt
Auto-merging core/dplugins/bqm/metadata/timeadjust/CMakeLists.txt
Auto-merging core/dplugins/bqm/metadata/removemetadata/CMakeLists.txt
Auto-merging core/dplugins/bqm/metadata/assigntemplate/CMakeLists.txt
Auto-merging core/dplugins/bqm/filters/filmgrain/CMakeLists.txt
Auto-merging core/dplugins/bqm/filters/colorfx/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/sharpen/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/restoration/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/noisereduction/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/localcontrast/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/lensautofix/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/hotpixels/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/blur/CMakeLists.txt
Auto-merging core/dplugins/bqm/enhance/antivignetting/CMakeLists.txt
Auto-merging core/dplugins/bqm/decorate/watermark/watermark.cpp
Auto-merging core/dplugins/bqm/decorate/watermark/CMakeLists.txt
Auto-merging core/dplugins/bqm/decorate/texture/CMakeLists.txt
Auto-merging core/dplugins/bqm/decorate/border/CMakeLists.txt
Auto-merging core/dplugins/bqm/custom/userscript/userscript.cpp
Auto-merging core/dplugins/bqm/custom/userscript/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttotiff/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttopng/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttopgf/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttojpeg/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttojp2/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttoheif/CMakeLists.txt
Auto-merging core/dplugins/bqm/convert/converttodng/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/whitebalance/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/invert/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/iccconvert/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/hslcorrection/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/curvesadjust/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/convert8to16/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/convert16to8/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/colorbalance/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/channelmixer/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/bwconvert/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/bcgcorrection/CMakeLists.txt
Auto-merging core/dplugins/bqm/colors/autocorrection/CMakeLists.txt
Removing core/cmake/templates/Info.plist.cmake.in
Auto-merging core/cmake/modules/MacroDPlugins.cmake
Auto-merging core/app/views/tableview/tableview.cpp
Auto-merging core/app/views/stack/welcomepageview.h
Auto-merging core/app/views/stack/welcomepageview.cpp
Auto-merging core/app/views/stack/trashview.cpp
Auto-merging core/app/views/stack/stackedview.cpp
Auto-merging core/app/utils/digikam_globals.h
CONFLICT (content): Merge conflict in core/app/utils/digikam_globals.h
Auto-merging core/app/utils/digikam_globals.cpp
CONFLICT (content): Merge conflict in core/app/utils/digikam_globals.cpp
Auto-merging core/app/utils/digikam_config.h.cmake.in
Auto-merging core/app/main/digikamapp_import.cpp
Auto-merging core/app/main/digikamapp.cpp
Auto-merging core/app/items/utils/itemviewutilities.cpp
Auto-merging core/app/date/timelinewidget.cpp
Auto-merging core/app/DigikamTarget.cmake
Auto-merging core/app/DigikamGuiTarget.cmake
Auto-merging core/app/DigikamDatabaseTarget.cmake
Auto-merging core/app/DigikamCoreTarget.cmake
Auto-merging core/app/CMakeLists.txt
Auto-merging core/CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.

-- 
You are receiving this mail because:
You are watching all bug changes.

[digikam] [Bug 416704] Port digiKam to Qt6 and KF6 API.

Reply via email to