Bug 416704

Summary:	Port digiKam to Qt6 and KF6 API.
Product:	[Applications] digikam	Reporter:	alain.pouchard1410
Component:	Portability-Compilation	Assignee:	Digikam Developers <digikam-bugs-null>
Status:	RESOLVED FIXED
Severity:	wishlist	CC:	anjanik012, caulier.gilles, metzpinguin
Priority:	NOR
Version:	7.6.0
Target Milestone:	---
Platform:	Compiled Sources
OS:	All
URL:	https://community.kde.org/GSoC/2021/StatusReports/AnjaniKumar
Latest Commit:		Version Fixed In:	8.0.0
Sentry Crash Report:

Description alain.pouchard1410 2020-01-24 18:32:07 UTC

Hello
I downloaded the debug version. I would have liked to generate a log to send you but I have not figured out how to do it.
Thank you
Kind regards

Comment 1 alain.pouchard1410 2020-01-24 18:48:59 UTC

By deduction, the processing time for exports comes from loading the album list. Would it be possible, if only in testing can only download the list of albums only on request. That would be much more efficient and timely.
Thank you
Kind regards

Comment 2 Maik Qualmann 2020-01-25 09:39:51 UTC

I think it's about bug 415365. What do you want to debug? DigiKam gives a lot of informations if you use DebugView from Microsoft. The digiKam debug version is more to better determine the code position in the event of a crash. On your problem of listing albums. How else do you want to upload photos to a specific album? When uploading, the album name is not used, but an album ID, which we learn by reading the album list.

Maik

Comment 3 Maik Qualmann 2020-01-25 09:40:21 UTC


*** This bug has been marked as a duplicate of bug 415365 ***

Comment 4 caulier.gilles 2022-02-03 09:37:20 UTC

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.

Comment 5 caulier.gilles 2022-02-03 09:38:25 UTC

All project/* conflicts must be overwritten with current git/master as well. All master code is ready to use for Qt6 port and work as expected.

Gilles Caulier

Comment 6 caulier.gilles 2022-02-06 13:54:06 UTC

Git commit ea0717d7b4b93517123c7e243aef4dbe0fe82a3c by Gilles Caulier.
Committed on 06/02/2022 at 13:51.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

fix maerge conflict with master

M  +2    -2    project/bundles/3rdparty/ext_cmake/CMakeLists.txt
M  +26   -70   project/bundles/3rdparty/ext_qt/6.2/CMakeLists.txt
D  +0    -19   project/bundles/3rdparty/ext_qt/6.2/qt6_setup.sh
M  +19   -4    project/bundles/appimage/config.sh

https://invent.kde.org/graphics/digikam/commit/ea0717d7b4b93517123c7e243aef4dbe0fe82a3c

Comment 7 caulier.gilles 2022-02-06 14:41:56 UTC

Git commit c106fc5b1c89e7fc413f294f27c4a179296e053e by Gilles Caulier.
Committed on 06/02/2022 at 13:56.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

fix merge master conflicts

M  +22   -163  core/app/utils/digikam_globals.cpp
M  +30   -30   core/app/utils/digikam_globals.h

https://invent.kde.org/graphics/digikam/commit/c106fc5b1c89e7fc413f294f27c4a179296e053e

Comment 8 caulier.gilles 2022-02-06 14:42:08 UTC

Git commit e2b0c1a8a1bd82a5a297569802905c686598d030 by Gilles Caulier.
Committed on 06/02/2022 at 13:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

fix merge master conflicts

A  +65   -0    core/app/utils/digikam_globals_p.h     [License: GPL (v2+)]

https://invent.kde.org/graphics/digikam/commit/e2b0c1a8a1bd82a5a297569802905c686598d030

Comment 9 caulier.gilles 2022-02-07 10:22:26 UTC

Git commit 17816c9bbc22e7530e72b1df530bd9a33b306470 by Gilles Caulier.
Committed on 07/02/2022 at 10:20.
Pushed by cgilles into branch 'master'.

add TODO list to merge master code in this branch

A  +18   -0    TODO.merge_master

https://invent.kde.org/graphics/digikam/commit/17816c9bbc22e7530e72b1df530bd9a33b306470

Comment 10 caulier.gilles 2022-02-07 10:28:02 UTC

Git commit 5fb7558e6f222fc59843f6b0c4bd3e85e1eff6e1 by Gilles Caulier.
Committed on 07/02/2022 at 10:26.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Fix merge master conflicts

A  +17   -0    TODO.merge_master
M  +183  -53   core/libs/dialogs/libsinfodlg.cpp

https://invent.kde.org/graphics/digikam/commit/5fb7558e6f222fc59843f6b0c4bd3e85e1eff6e1

Comment 11 caulier.gilles 2022-02-07 21:26:32 UTC

Git commit 4562f9252c8d97776e4250801261a5b3f3e1d1a0 by Gilles Caulier.
Committed on 07/02/2022 at 21:24.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Merge branch 'master' into gsoc21-qt6-port

A  +17   -17   TODO.merge_master
M  +20   -22   core/CMakeLists.txt
M  +1    -1    core/app/CMakeLists.txt
M  +2    -1    core/app/DigikamCoreTarget.cmake
M  +1    -1    core/app/DigikamDatabaseTarget.cmake
M  +9    -1    core/app/DigikamGuiTarget.cmake
M  +29   -13   core/app/DigikamTarget.cmake
M  +1    -1    core/app/date/timelinewidget.cpp
M  +1    -1    core/app/items/utils/itemviewutilities.cpp
M  +52   -35   core/app/main/digikamapp.cpp
M  +1    -1    core/app/main/digikamapp_import.cpp
M  +1    -1    core/app/utils/digikam_config.h.cmake.in
M  +1    -4    core/app/views/stack/stackedview.cpp
M  +1    -1    core/app/views/stack/trashview.cpp
M  +24   -7    core/app/views/stack/welcomepageview.cpp
M  +1    -1    core/app/views/stack/welcomepageview.h
M  +1    -1    core/app/views/tableview/tableview.cpp
M  +1    -1    core/cmake/modules/MacroDPlugins.cmake
M  +1    -1    core/dplugins/bqm/colors/autocorrection/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/bcgcorrection/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/bwconvert/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/channelmixer/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/colorbalance/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/convert16to8/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/convert8to16/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/curvesadjust/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/hslcorrection/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/iccconvert/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/invert/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/colors/whitebalance/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttodng/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttoheif/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttojp2/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttojpeg/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttopgf/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttopng/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttotiff/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/custom/userscript/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/custom/userscript/userscript.cpp
M  +1    -1    core/dplugins/bqm/decorate/border/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/decorate/texture/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/decorate/watermark/CMakeLists.txt
M  +86   -26   core/dplugins/bqm/decorate/watermark/watermark.cpp
M  +1    -1    core/dplugins/bqm/enhance/antivignetting/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/blur/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/hotpixels/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/lensautofix/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/localcontrast/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/noisereduction/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/restoration/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/enhance/sharpen/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/filters/colorfx/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/filters/filmgrain/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/metadata/assigntemplate/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/metadata/removemetadata/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/metadata/timeadjust/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/transform/crop/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/transform/flip/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/transform/resize/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/transform/rotate/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/heif/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/imagemagick/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/jpeg/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/jpeg2000/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/pgf/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/png/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/qimage/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/raw/CMakeLists.txt
M  +1    -1    core/dplugins/dimg/tiff/CMakeLists.txt
M  +14   -10   core/dplugins/dimg/tiff/dimgtiffloader_load.cpp
M  +1    -1    core/dplugins/editor/colors/adjustcurves/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/adjustlevels/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/autocorrection/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/bcg/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/bwsepia/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/channelmixer/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/colorbalance/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/convert16to8/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/convert8to16/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/film/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/hsl/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/invert/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/profileconversion/CMakeLists.txt
M  +1    -1    core/dplugins/editor/colors/whitebalance/CMakeLists.txt
M  +1    -1    core/dplugins/editor/decorate/border/CMakeLists.txt
M  +1    -1    core/dplugins/editor/decorate/inserttext/CMakeLists.txt
M  +1    -1    core/dplugins/editor/decorate/texture/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/antivignetting/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/blur/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/healingclone/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/hotpixels/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/lensautofix/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/lensdistortion/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/localcontrast/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/noisereduction/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/redeye/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/restoration/CMakeLists.txt
M  +1    -1    core/dplugins/editor/enhance/sharpen/CMakeLists.txt
M  +1    -1    core/dplugins/editor/file/print/CMakeLists.txt
M  +1    -1    core/dplugins/editor/file/print/printhelper.cpp
M  +1    -1    core/dplugins/editor/filters/blurfx/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/charcoal/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/colorfx/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/distortionfx/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/emboss/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/filmgrain/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/oilpaint/CMakeLists.txt
M  +1    -1    core/dplugins/editor/filters/raindrop/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/autocrop/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/contentawareresize/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/freerotation/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/perspective/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/ratiocrop/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/resize/CMakeLists.txt
M  +1    -1    core/dplugins/editor/transform/shear/CMakeLists.txt
M  +1    -1    core/dplugins/generic/import/dscanner/CMakeLists.txt
M  +1    -1    core/dplugins/generic/metadata/geolocationedit/kmlexport/kmlexport.cpp
M  +3    -3    core/dplugins/generic/metadata/metadataedit/exif/exifcaption.cpp
M  +3    -3    core/dplugins/generic/metadata/metadataedit/exif/exifdevice.cpp
M  +3    -3    core/dplugins/generic/metadata/metadataedit/xmp/xmpsubjects.cpp
M  +1    -1    core/dplugins/generic/metadata/timeadjust/CMakeLists.txt
M  +1    -1    core/dplugins/generic/tools/calendar/print/calsettings.cpp
M  +3    -3    core/dplugins/generic/tools/calendar/wizard/calwizard.cpp
M  +1    -1    core/dplugins/generic/tools/dngconverter/CMakeLists.txt
M  +1    -1    core/dplugins/generic/tools/expoblending/manager/expoblendingthread.cpp
M  +1    -1    core/dplugins/generic/tools/htmlgallery/generator/galleryelementfunctor.cpp
M  +1    -1    core/dplugins/generic/tools/htmlgallery/generator/gallerygenerator.cpp
M  +1    -1    core/dplugins/generic/tools/htmlgallery/wizard/htmlfinalpage.cpp
M  +1    -1    core/dplugins/generic/tools/mediaserver/CMakeLists.txt
M  +2    -2    core/dplugins/generic/tools/mediaserver/server/dmediaservermngr.cpp
M  +36   -14   core/dplugins/generic/tools/mjpegstream/mjpegservermngr.cpp
M  +1    -1    core/dplugins/generic/tools/printcreator/manager/advprintphoto.cpp
M  +1    -1    core/dplugins/generic/tools/printcreator/manager/advprintphoto.h
M  +1    -1    core/dplugins/generic/tools/printcreator/manager/advprinttask.cpp
M  +1    -1    core/dplugins/generic/tools/printcreator/wizard/advprintcropframe.cpp
M  +1    -1    core/dplugins/generic/tools/printcreator/wizard/advprintfinalpage.cpp
M  +3    -3    core/dplugins/generic/tools/printcreator/wizard/advprintphotopage.cpp
M  +13   -17   core/dplugins/generic/tools/printcreator/wizard/advprintwizard.cpp
M  +1    -1    core/dplugins/generic/tools/sendbymail/manager/mailprocess.cpp
M  +1    -1    core/dplugins/generic/tools/wallpaper/CMakeLists.txt
M  +4    -4    core/dplugins/generic/view/glviewer/glviewerwidget.cpp
M  +1    -1    core/dplugins/generic/view/presentation/audio/presentation_audiopage.cpp
M  +3    -2    core/dplugins/generic/view/presentation/dialogs/presentation_mainpage.cpp
M  +1    -1    core/dplugins/generic/view/presentation/opengl/kbeffect.cpp
M  +2    -2    core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
M  +1    -1    core/dplugins/generic/view/presentation/opengl/presentationgl.h
M  +2    -2    core/dplugins/generic/view/presentation/opengl/presentationkb.cpp
M  +1    -1    core/dplugins/generic/view/presentation/opengl/presentationkb.h
M  +1    -1    core/dplugins/generic/view/presentation/opengl/presentationkb_p.h
M  +1    -1    core/dplugins/generic/view/presentation/presentationmngr.cpp
M  +6    -4    core/dplugins/generic/view/presentation/widgets/presentationwidget.cpp
M  +1    -1    core/dplugins/generic/view/presentation/widgets/presentationwidget.h
M  +1    -1    core/dplugins/generic/view/slideshow/common/slideshowsettings.cpp
M  +1    -1    core/dplugins/generic/webservices/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/box/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/dropbox/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/filecopy/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/filetransfer/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/flickr/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/flickr/flickrlist.cpp
M  +1    -1    core/dplugins/generic/webservices/flickr/flickrtalker.cpp
M  +1    -1    core/dplugins/generic/webservices/flickr/flickrwindow.cpp
M  +1    -1    core/dplugins/generic/webservices/google/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/imageshack/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/imgur/CMakeLists.txt
M  +50   -8    core/dplugins/generic/webservices/inaturalist/inatwindow.cpp
M  +1    -1    core/dplugins/generic/webservices/mediawiki/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryinfo.cpp
M  +1    -1    core/dplugins/generic/webservices/mediawiki/mediawikitalker.cpp
M  +1    -1    core/dplugins/generic/webservices/mediawiki/mediawikiwidget.cpp
M  +1    -1    core/dplugins/generic/webservices/onedrive/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/pinterest/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/piwigo/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/piwigo/piwigotalker.cpp
M  +1    -1    core/dplugins/generic/webservices/rajce/rajcecommand.cpp
M  +2    -2    core/dplugins/generic/webservices/rajce/rajcetalker.cpp
M  +1    -1    core/dplugins/generic/webservices/rajce/rajcewidget.cpp
M  +1    -1    core/dplugins/generic/webservices/smugmug/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/twitter/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/vkontakte/CMakeLists.txt
M  +1    -1    core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_allmessageslistjob.cpp
M  +1    -1    core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_discussionslistjob.cpp
M  +1    -1    core/dplugins/generic/webservices/vkontakte/backend/attic/vkontakte_messageinfo.cpp
M  +2    -2    core/dplugins/generic/webservices/vkontakte/backend/vkontakte_authenticationdialog.cpp
M  +1    -1    core/dplugins/generic/webservices/yandexfotki/CMakeLists.txt
M  +1    -1    core/dplugins/rawimport/darktable/CMakeLists.txt
M  +31   -5    core/dplugins/rawimport/darktable/rawimportdarktableplugin.cpp
M  +1    -1    core/dplugins/rawimport/native/CMakeLists.txt
M  +1    -1    core/dplugins/rawimport/rawtherapee/CMakeLists.txt
M  +26   -6    core/dplugins/rawimport/rawtherapee/rawimportrawtherapeeplugin.cpp
M  +1    -1    core/dplugins/rawimport/ufraw/CMakeLists.txt
M  +24   -4    core/dplugins/rawimport/ufraw/rawimportufrawplugin.cpp
M  +1    -1    core/libs/album/CMakeLists.txt
M  +1    -1    core/libs/album/manager/albummanager.cpp
M  +11   -2    core/libs/album/manager/albummanager_database.cpp
M  +1    -1    core/libs/album/manager/albummanager_p.h
M  +21   -13   core/libs/album/widgets/albumpropsedit.cpp
M  +1    -1    core/libs/database/CMakeLists.txt
M  +3    -3    core/libs/database/collection/collectionmanager_location.cpp
M  +102  -32   core/libs/database/collection/collectionscanner_scan.cpp
M  +26   -5    core/libs/database/collection/collectionscanner_utils.cpp
M  +168  -28   core/libs/database/coredb/coredb.cpp
M  +1    -1    core/libs/database/coredb/coredbnamefilter.cpp
M  +1    -1    core/libs/database/coredb/coredbnamefilter.h
M  +37   -7    core/libs/database/coredb/coredbschemaupdater.cpp
M  +1    -1    core/libs/database/coredb/coredbsearchxml.cpp
M  +1    -1    core/libs/database/dbjobs/dbjobsthread.cpp
M  +1    -1    core/libs/database/engine/dbenginebackend.cpp
M  +1    -1    core/libs/database/engine/dbenginebackend.h
M  +2    -2    core/libs/database/engine/dbengineparameters.cpp
M  +42   -10   core/libs/database/haar/haariface.cpp
M  +1    -1    core/libs/database/history/itemhistorygraphmodel.cpp
M  +1    -1    core/libs/database/item/containers/itemcopyright.cpp
M  +1    -1    core/libs/database/item/containers/itemextendedproperties.cpp
M  +1    -1    core/libs/database/item/lister/itemlister.cpp
M  +1    -1    core/libs/database/item/lister/itemlister_p.h
M  +1    -1    core/libs/database/item/lister/itemlister_salbum.cpp
M  +1    -1    core/libs/database/item/query/fieldquerybuilder.cpp
M  +18   -4    core/libs/database/item/query/itemquerybuilder.cpp
M  +1    -1    core/libs/database/item/query/itemqueryposthooks.cpp
M  +64   -5    core/libs/database/item/scanner/itemscanner_photo.cpp
M  +11   -1    core/libs/database/models/itemfiltersettings.cpp
M  +1    -1    core/libs/database/models/itemmodel.cpp
M  +31   -91   core/libs/database/server/databaseserver.cpp
M  +33   -20   core/libs/database/tags/facetags.cpp
M  +1    -15   core/libs/database/tags/facetags.h
M  +75   -47   core/libs/database/tags/tagscache.cpp
M  +1    -1    core/libs/database/thumbsdb/thumbsdb.cpp
M  +63   -31   core/libs/database/utils/widgets/dbsettingswidget.cpp
M  +4    -1    core/libs/dialogs/CMakeLists.txt
M  +1    -1    core/libs/dialogs/dconfigdlgwidgets.cpp
M  +1    -1    core/libs/dialogs/dconfigdlgwidgets.h
M  +9    -5    core/libs/dimg/CMakeLists.txt
M  +1    -1    core/libs/dimg/filters/curves/curvessettings.cpp
M  +1    -1    core/libs/dimg/filters/decorate/borderfilter.cpp
M  +1    -1    core/libs/dimg/filters/hotpixels/hotpixelfixer.cpp
M  +1    -1    core/libs/dimg/filters/hotpixels/hotpixelprops.cpp
M  +1    -1    core/libs/dimg/filters/icc/iccprofile.cpp
M  +1    -1    core/libs/dimg/filters/icc/iccsettings.cpp
M  +10   -3    core/libs/dimg/filters/imgqsort/imagequalitycontainer.cpp
M  +1    -1    core/libs/dimg/filters/lc/localcontrastsettings.cpp
M  +1    -1    core/libs/dimg/filters/lens/lensfuniface.cpp
M  +1    -1    core/libs/dimg/filters/transform/autocrop.cpp
M  +1    -1    core/libs/dimg/filters/wb/wbsettings.cpp
M  +3    -1    core/libs/dplugins/CMakeLists.txt
M  +4    -3    core/libs/dplugins/core/dplugineditor.cpp
M  +5    -3    core/libs/dplugins/core/dplugingeneric.cpp
M  +5    -5    core/libs/dplugins/setup/dpluginconfview.cpp
M  +2    -2    core/libs/dplugins/setup/dpluginloader.cpp
M  +2    -2    core/libs/dplugins/setup/dpluginloader_p.cpp
M  +1    -1    core/libs/dplugins/webservices/o2/src/o1.cpp
M  +60   -482  core/libs/dplugins/widgets/ditemslist.cpp
M  +1    -1    core/libs/dragdrop/CMakeLists.txt
M  +12   -1    core/libs/dtrash/dtrash.cpp
M  +1    -1    core/libs/facesengine/common/identity.cpp
M  +1    -1    core/libs/facesengine/common/identity.h
M  +1    -1    core/libs/facesengine/facedb/facedb_identity.cpp
M  +1    -1    core/libs/facesengine/recognition/facialrecognition_wrapper.h
M  +1    -1    core/libs/facesengine/recognition/facialrecognition_wrapper_identity.cpp
M  +1    -1    core/libs/facesengine/recognition/facialrecognition_wrapper_p.cpp
M  +1    -1    core/libs/facesengine/recognition/facialrecognition_wrapper_p.h
M  +1    -1    core/libs/fileactionmanager/CMakeLists.txt
M  +6    -4    core/libs/fileactionmanager/metadatahub.cpp
M  +1    -1    core/libs/filters/CMakeLists.txt
M  +1    -1    core/libs/jpegutils/CMakeLists.txt
M  +1    -1    core/libs/jpegutils/jpegutils.cpp
M  +1    -1    core/libs/kmemoryinfo/CMakeLists.txt
M  +11   -1    core/libs/metadataengine/CMakeLists.txt
M  +1    -1    core/libs/metadataengine/dmetadata/dmetadata_generic.cpp
M  +6    -6    core/libs/metadataengine/engine/metaengine.h
M  +9    -6    core/libs/metadataengine/engine/metaengine_exif.cpp
M  +2    -2    core/libs/metadataengine/engine/metaengine_p.cpp
M  +1    -1    core/libs/metadataengine/engine/metaengine_rotation.cpp
M  +1    -1    core/libs/metadataengine/engine/metaengine_rotation.h
M  +2    -2    core/libs/metadataengine/exiftool/exiftoolparser_command.cpp
M  +14   -3    core/libs/metadataengine/exiftool/exiftoolparser_output.cpp
M  +1    -1    core/libs/models/CMakeLists.txt
M  +2    -2    core/libs/models/abstractalbummodel.cpp
M  +4    -7    core/libs/models/albumfiltermodel.cpp
M  +1    -1    core/libs/notificationmanager/CMakeLists.txt
M  +1    -1    core/libs/notificationmanager/dnotificationpopup.cpp
M  +1    -1    core/libs/onlineversion/CMakeLists.txt
M  +1    -1    core/libs/pgfutils/CMakeLists.txt
M  +1    -1    core/libs/progressmanager/CMakeLists.txt
M  +1    -1    core/libs/properties/CMakeLists.txt
M  +13   -2    core/libs/properties/captions/itemdescedittab.cpp
M  +1    -1    core/libs/properties/itempropertiessidebardb.cpp
M  +31   -13   core/libs/properties/itempropertiestab.cpp
M  +1    -1    core/libs/rawengine/drawdecodersettings.cpp
M  +1    -1    core/libs/settings/CMakeLists.txt
M  +1    -1    core/libs/tags/CMakeLists.txt
M  +1    -1    core/libs/tags/widgets/tageditdlg.cpp
M  +13   -9    core/libs/tags/widgets/tagfolderview.cpp
M  +1    -1    core/libs/tags/widgets/tagspopupmenu.cpp
M  +1    -1    core/libs/template/CMakeLists.txt
M  +1    -1    core/libs/template/subjectedit.cpp
M  +1    -1    core/libs/template/templatemanager.cpp
M  +2    -2    core/libs/template/templatepanel.cpp
M  +14   -7    core/libs/threadimageio/CMakeLists.txt
M  +1    -1    core/libs/threadimageio/engine/dfileoperations.cpp
M  +275  -0    core/libs/threadimageio/engine/dservicemenu_linux.cpp
M  +2    -2    core/libs/threadimageio/fileio/loadsavethread.cpp
M  +1    -1    core/libs/threadimageio/thumb/thumbnailcreator_engine.cpp
M  +1    -1    core/libs/threads/CMakeLists.txt
M  +1    -1    core/libs/timeadjust/CMakeLists.txt
M  +10   -24   core/libs/timeadjust/timeadjustcontainer.cpp
M  +1    -1    core/libs/transitionmngr/CMakeLists.txt
M  +1    -1    core/libs/transitionmngr/effectmngr.cpp
M  +1    -1    core/libs/transitionmngr/effectmngr_p.cpp
M  +1    -1    core/libs/transitionmngr/transitionmngr.cpp
M  +1    -1    core/libs/transitionmngr/transitionmngr_p.cpp
M  +30   -30   core/libs/transitionmngr/transitionmngr_p.h
M  +1    -1    core/libs/transitionmngr/transitionmngr_p_abstract.cpp
M  +1    -1    core/libs/transitionmngr/transitionmngr_p_lines.cpp
M  +1    -1    core/libs/versionmanager/CMakeLists.txt
M  +32   -11   core/libs/video/CMakeLists.txt
M  +5    -1    core/libs/widgets/CMakeLists.txt
M  +1    -1    core/libs/widgets/files/dbinaryiface.cpp
M  +23   -6    core/libs/widgets/files/filesaveconflictbox.cpp
M  +1    -1    core/libs/widgets/graphicsview/graphicsdimgview.cpp
M  +1    -1    core/libs/widgets/graphicsview/itemvisibilitycontroller.cpp
M  +1    -1    core/libs/widgets/itemview/itemviewcategorized.cpp
M  +1    -1    core/libs/widgets/layout/dexpanderbox.cpp
M  +17   -6    core/libs/widgets/layout/sidebar.cpp
M  +1    -1    core/libs/widgets/metadata/utils/subjectwidget.cpp
M  +70   -14   core/showfoto/CMakeLists.txt
M  +38   -3    core/showfoto/thumbbar/showfotoiteminfo.cpp
M  +685  -0    core/showfoto/thumbbar/showfotoitemmodel.cpp
M  +2    -1    core/tests/CMakeLists.txt
M  +1    -1    core/tests/advancedrename/CMakeLists.txt
M  +1    -1    core/tests/albummodel/CMakeLists.txt
M  +3    -3    core/tests/database/CMakeLists.txt
M  +1    -1    core/tests/dimg/CMakeLists.txt
M  +1    -1    core/tests/dngwriter/dnginfo_cli.cpp
M  +1    -1    core/tests/facesengine/demo/demomainwindow.cpp
M  +1    -1    core/tests/facesengine/recognition/benchmark_recognition_cli.cpp
M  +1    -1    core/tests/facesengine/recognition/recognition_gui.cpp
M  +1    -1    core/tests/facesengine/recognition/traindb_cli.cpp
M  +25   -4    core/tests/fileio/CMakeLists.txt
M  +1    -1    core/tests/filters/CMakeLists.txt
M  +15   -7    core/tests/imgqsort/CMakeLists.txt
M  +1    -1    core/tests/mediawiki/fakeserver/fakeserver.cpp
M  +1    -0    core/tests/metadataengine/CMakeLists.txt
M  +1    -1    core/tests/metadataengine/dmetadataloader_cli.cpp
M  +1    -1    core/tests/metadataengine/exiftool/exiftoolmulticore_cli.cpp
M  +1    -1    core/tests/metadataengine/exiftool/exiftooloutput_cli.cpp
M  +1    -1    core/tests/metadataengine/exiftool/exiftooltagsdb_cli.cpp
M  +1    -1    core/tests/metadataengine/metareaderthread_utest.cpp
M  +1    -1    core/tests/metadataengine/printmetadata_utest.cpp
M  +1    -1    core/tests/metadataengine/printtagslist_utest.cpp
M  +1    -1    core/tests/miscs/CMakeLists.txt
M  +1    -1    core/tests/miscs/browser_gui.cpp
M  +1    -1    core/tests/multithreading/processordlg.cpp
M  +1    -1    core/tests/timestampupdate/CMakeLists.txt
M  +1    -1    core/tests/video/CMakeLists.txt
M  +1    -1    core/tests/widgets/CMakeLists.txt
M  +2    -1    core/utilities/CMakeLists.txt
M  +1    -1    core/utilities/advancedrename/CMakeLists.txt
M  +1    -1    core/utilities/advancedrename/advancedrenamemanager.cpp
M  +6    -5    core/utilities/advancedrename/common/parser.cpp
M  +1    -1    core/utilities/advancedrename/common/rule.cpp
M  +6    -3    core/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp
M  +1    -1    core/utilities/extrasupport/addressbook/CMakeLists.txt
M  +1    -1    core/utilities/extrasupport/filesindexer/CMakeLists.txt
M  +1    -1    core/utilities/facemanagement/CMakeLists.txt
M  +1    -1    core/utilities/facemanagement/bench/detectionbenchmarker.cpp
M  +1    -1    core/utilities/facemanagement/bench/recognitionbenchmarker.cpp
M  +7    -5    core/utilities/facemanagement/database/faceutils.cpp
M  +40   -5    core/utilities/facemanagement/items/facegroup.cpp
M  +1    -1    core/utilities/firstrun/CMakeLists.txt
M  +1    -1    core/utilities/fuzzysearch/CMakeLists.txt
M  +1    -1    core/utilities/fuzzysearch/fuzzysearchview.cpp
M  +2    -2    core/utilities/fuzzysearch/sketchwidget.cpp
M  +1    -1    core/utilities/geolocation/geoiface/CMakeLists.txt
M  +3    -3    core/utilities/geolocation/geoiface/backends/backendgooglemaps.cpp
M  +1    -1    core/utilities/geolocation/geoiface/lookup/lookupaltitudegeonames.cpp
M  +1    -1    core/utilities/geolocation/geoiface/tracks/trackmanager.cpp
M  +84   -71   core/utilities/geolocation/geoiface/widgets/mapwidget.cpp
M  +1    -1    core/utilities/geolocation/geomapwrapper/CMakeLists.txt
M  +1    -1    core/utilities/geolocation/mapsearches/CMakeLists.txt
M  +1    -1    core/utilities/geolocation/mapsearches/gpssearchview.cpp
M  +1    -1    core/utilities/imageeditor/CMakeLists.txt
M  +87   -50   core/utilities/imageeditor/editor/editorwindow.cpp
M  +1    -1    core/utilities/imageeditor/widgets/previewtoolbar.cpp
M  +1    -1    core/utilities/import/CMakeLists.txt
M  +1    -1    core/utilities/import/backend/cameracontroller.cpp
M  +1    -1    core/utilities/import/dialogs/camerafolderdialog.cpp
M  +3    -3    core/utilities/import/main/importui.cpp
M  +1    -1    core/utilities/import/views/importview.cpp
M  +1    -1    core/utilities/lighttable/CMakeLists.txt
M  +1    -1    core/utilities/maintenance/CMakeLists.txt
M  +39   -18   core/utilities/maintenance/databasetask.cpp
M  +3    -2    core/utilities/maintenance/facesdetector.cpp
M  +24   -21   core/utilities/maintenance/maintenancesettings.cpp
M  +1    -1    core/utilities/queuemanager/CMakeLists.txt
M  +1    -1    core/utilities/queuemanager/dplugins/dpluginbqm.cpp
M  +1    -1    core/utilities/queuemanager/manager/batchtoolsfactory.cpp
M  +1    -1    core/utilities/queuemanager/manager/workflowmanager.cpp
M  +1    -1    core/utilities/queuemanager/views/workflowdlg.cpp
M  +1    -1    core/utilities/searchwindow/CMakeLists.txt
M  +1    -1    core/utilities/searchwindow/searchfieldgroup.cpp
M  +1    -1    core/utilities/searchwindow/searchfields.cpp
M  +1    -1    core/utilities/searchwindow/searchgroup.cpp
M  +1    -1    core/utilities/setup/CMakeLists.txt
M  +1    -1    core/utilities/setup/camera/cameralist.cpp
M  +1    -1    core/utilities/setup/camera/importfilterdlg.cpp
M  +1    -1    core/utilities/setup/collections/dwitemdelegatepool.cpp
M  +3    -1    core/utilities/setup/collections/setupcollectionview.cpp
M  +1    -1    core/utilities/setup/downloader/filesdownloader.cpp
M  +1    -1    project/bundles/3rdparty/ext_libicu/CMakeLists.txt
M  +49   -5    project/bundles/appimage/01-build-host.sh

https://invent.kde.org/graphics/digikam/commit/4562f9252c8d97776e4250801261a5b3f3e1d1a0

Comment 12 caulier.gilles 2022-02-07 21:37:04 UTC

Maik,

I fixed the branches "gsoc21-qt6-port", fixed the conflicts and committed with your mast changes from master.

I don't yet checked if code compile fine under Qt6, this is the next step.

This branch must be sync with master changes step by step until we decide to merge back to master the Qt6 port done by Anjani. 

Best 

Gilles

Comment 13 caulier.gilles 2022-02-07 21:44:09 UTC

Git commit 4aeb4ff234c12f0909140687616570355e12375b by Gilles Caulier.
Committed on 07/02/2022 at 21:40.
Pushed by cgilles into branch 'master'.

prepare to compile AppImage with Qt6 port

M  +1    -1    project/bundles/appimage/config.sh

https://invent.kde.org/graphics/digikam/commit/4aeb4ff234c12f0909140687616570355e12375b

diff --git a/project/bundles/appimage/config.sh b/project/bundles/appimage/config.sh
index a38a5e9c63..ba3e40fb3f 100644
--- a/project/bundles/appimage/config.sh
+++ b/project/bundles/appimage/config.sh
@@ -45,7 +45,7 @@ DK_KF5_VERSION="5.90"
 # If you want to package current implementation from git, use "master" as tag.
 #DK_VERSION=v7.0.0
 DK_VERSION=master
-#DK_VERSION=gsoc18-exporttools-o2
+#DK_VERSION=gsoc21-qt6-port

 # Installer sub version to differentiates newer updates of the installer itself, even if the underlying application hasn’t changed.
 #DK_SUBVER="-01"

Comment 14 Maik Qualmann 2022-02-08 06:58:42 UTC

Hi Giles,

We should quickly merge the Qt6 branch into master. 
I think Anjani took care that compiling with a smaller Qt version doesn't fail.

Maik

Comment 15 caulier.gilles 2022-02-08 07:36:14 UTC

Hi, Maik,

Yes and no. I agree that merge ASAP this branch in master in a priority, but not all compilation cases are supported yet.

On my VM with Qt6 + KF6, now all configure fine, but compilation is completely broken due to non detection of C++ 17 compliant compiler for MOC files, where GCC 10 is installed and have been used to compile Qt6 and KF6.

I'm working on, i will found the problem...

Gilles

Comment 16 caulier.gilles 2022-02-08 08:47:37 UTC

Git commit 14ab860da01dcdb2edb95bb62cdadf27454a6eaf by Gilles Caulier.
Committed on 08/02/2022 at 08:46.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

compiling with Qt6 require at least to be C++17 compliant

M  +1    -1    CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/14ab860da01dcdb2edb95bb62cdadf27454a6eaf

Comment 17 caulier.gilles 2022-02-08 10:47:39 UTC

Configuring for Qt6+KF6 is fine more and less:

[root@localhost 7.x]# ./bootstrap.qt6
-- CMake version: cmake version 3.22.2

CMake suite maintained and supported by Kitware (kitware.com/cmake).

-- The CXX compiler identification is GNU 10.3.0
-- The C compiler identification is GNU 10.3.0
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- ----------------------------------------------------------------------------------
-- Starting CMake configuration for digikam
-- 
Installing in /usr. Run /home/gilles/Documents/7.x/build/prefix.sh to set the environment for digikam.
-- Looking for __GLIBC__
-- Looking for __GLIBC__ - found
-- Performing Test _OFFT_IS_64BIT
-- Performing Test _OFFT_IS_64BIT - Success
-- Performing Test HAVE_DATE_TIME
-- Performing Test HAVE_DATE_TIME - Success
-- Documentation translations directory is missing.
-- You can use DIGIKAMSC_CHECKOUT_DOC option to extract doc i18n files from git repositories.
-- ----------------------------------------------------------------------------------
-- Top level compilation configuration for digikam
-- 
-- digikam will be compiled....................... YES
-- Extract application translations files......... NO
-- Extract documentation translations files....... NO
-- Translations will be compiled.................. NO
-- Handbooks will be compiled..................... NO
-- Tests code will be compiled.................... NO
-- ----------------------------------------------------------------------------------
-- Check dependencies for digikam version 7.6.0
-- 
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
-- Check if compiler accepts -pthread
-- Check if compiler accepts -pthread - yes
-- Found Threads: TRUE  
-- Qt Major Version found: 6
-- Performing Test HAVE_STDATOMIC
-- Performing Test HAVE_STDATOMIC - Success
-- Found WrapAtomic: TRUE  
-- Found OpenGL: /usr/lib64/libOpenGL.so   
-- Found WrapOpenGL: TRUE  
-- Found XKB: /usr/lib64/libxkbcommon.so (found suitable version "1.0.3", minimum required is "0.5.0") 
-- Found KF5XmlGui: /usr/lib64/cmake/KF5XmlGui/KF5XmlGuiConfig.cmake (found version "5.91.0") 
-- Found KF5CoreAddons: /usr/lib64/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found version "5.91.0") 
-- Found KF5Config: /usr/lib64/cmake/KF5Config/KF5ConfigConfig.cmake (found version "5.91.0") 
-- Found KF5Service: /usr/lib64/cmake/KF5Service/KF5ServiceConfig.cmake (found version "5.91.0") 
-- Found X11: /usr/include   
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so - found
-- Looking for gethostbyname
-- Looking for gethostbyname - found
-- Looking for connect
-- Looking for connect - found
-- Looking for remove
-- Looking for remove - found
-- Looking for shmat
-- Looking for shmat - found
-- Looking for IceConnectionNumber in ICE
-- Looking for IceConnectionNumber in ICE - found
-- Found KF5WindowSystem: /usr/lib64/cmake/KF5WindowSystem/KF5WindowSystemConfig.cmake (found version "5.91.0") 
-- Found KF5Solid: /usr/lib64/cmake/KF5Solid/KF5SolidConfig.cmake (found version "5.91.0") 
-- Found Gettext: /usr/bin/msgmerge (found version "0.21") 
-- Found KF5I18n: /usr/lib64/cmake/KF5I18n/KF5I18nConfig.cmake (found version "5.91.0") 
-- Found KF5: success (found suitable version "5.91.0", minimum required is "5.5.0") found components: XmlGui CoreAddons Config Service WindowSystem Solid I18n 
-- Found KF5KIO: /usr/lib64/cmake/KF5KIO/KF5KIOConfig.cmake (found version "5.91.0") 
-- Found KF5IconThemes: /usr/lib64/cmake/KF5IconThemes/KF5IconThemesConfig.cmake (found version "5.91.0") 
-- Could NOT find KF5FileMetaData: found neither KF5FileMetaDataConfig.cmake nor kf5filemetadata-config.cmake 
-- Found KF5ThreadWeaver: /usr/lib64/cmake/KF5ThreadWeaver/KF5ThreadWeaverConfig.cmake (found version "5.91.0") 
-- Found KF5NotifyConfig: /usr/lib64/cmake/KF5NotifyConfig/KF5NotifyConfigConfig.cmake (found version "5.91.0") 
-- Found KF5Notifications: /usr/lib64/cmake/KF5Notifications/KF5NotificationsConfig.cmake (found version "5.91.0") 
-- Could NOT find KF5AkonadiContact: found neither KF5AkonadiContactConfig.cmake nor kf5akonadicontact-config.cmake 
-- Could NOT find KF5Contacts: found neither KF5ContactsConfig.cmake nor kf5contacts-config.cmake 
-- Could NOT find KF5Sane: found neither KF5SaneConfig.cmake nor kf5sane-config.cmake 
-- Found KF5CalendarCore: /usr/lib64/cmake/KF5CalendarCore/KF5CalendarCoreConfig.cmake (found version "5.91.0") 
-- KF5::KIOWidgets include dirs: /usr/include/KF6/KIOWidgets
-- Found JPEG: /usr/lib64/libjpeg.so (found version "80") 
-- Libjpeg version: 84
-- Using libjpeg sub-directory: libjpeg/84
-- Found TIFF: /usr/lib64/libtiff.so (found version "4.2.0")  
-- Found ZLIB: /usr/lib64/libz.so (found version "1.2.11") 
-- Found PNG: /usr/lib64/libpng.so (found version "1.6.37") 
-- Found Boost: /usr/lib64/cmake/Boost-1.75.0/BoostConfig.cmake (found version "1.75.0")  
-- Found PkgConfig: /usr/bin/pkg-config (found version "1.7.3") 
-- Checking for module 'lcms2'
--   Found lcms2, version 2.11
-- Found lcms version 2.10, /usr/lib64/liblcms2.so
-- Found EXPAT: /usr/lib64/libexpat.so (found version "2.2.10") 
-- Checking for module 'x265'
--   Found x265, version 3.4
-- Found X265: /usr/include  
-- X265_FOUND        = TRUE
-- X265_INCLUDE_DIRS = /usr/include
-- X265_LIBRARIES    = /usr/lib64/libx265.so
-- X265_DEFINITIONS  = 
-- Checking for module 'libavcodec'
--   Found libavcodec, version 58.91.100
-- Checking for module 'libavfilter'
--   Found libavfilter, version 7.85.100
-- Checking for module 'libavformat'
--   Found libavformat, version 58.45.100
-- Checking for module 'libavdevice'
--   Found libavdevice, version 58.10.100
-- Checking for module 'libavutil'
--   Found libavutil, version 56.51.100
-- Checking for module 'libswscale'
--   Found libswscale, version 5.7.100
-- Checking for module 'libpostproc'
--   Found libpostproc, version 55.7.100
-- Found FFmpeg: /usr/lib64/libavcodec.so;/usr/lib64/libavdevice.so;/usr/lib64/libavfilter.so;/usr/lib64/libavformat.so;/usr/lib64/libavutil.so;/usr/lib64/libswscale.so  
-- FFMPEG_FOUND        = TRUE
-- FFMPEG_INCLUDE_DIRS = /usr/include
-- FFMPEG_LIBRARIES    = /usr/lib64/libavcodec.so;/usr/lib64/libavdevice.so;/usr/lib64/libavfilter.so;/usr/lib64/libavformat.so;/usr/lib64/libavutil.so;/usr/lib64/libswscale.so
-- FFMPEG_DEFINITIONS  = 
-- QtAV search path: 
-- Found QtAV: /usr/lib/libQtAV.so;/usr/lib/libQtAVWidgets.so  
-- Found QtAV version header: /usr/include/QtAV/version.h
-- Found QtAV version 1.13.0
-- QtAV_FOUND       = TRUE
-- QtAV_INCLUDE_DIR = /usr/include/QtAV /usr/include/QtAVWidgets
-- QtAV_LIBRARIES   = /usr/lib/libQtAV.so;/usr/lib/libQtAVWidgets.so
-- QtAV_VERSION     = 1.13.0
-- Media player support is enabled.
-- Found OpenCV: /usr (found version "4.5.3") found components: core objdetect imgproc imgcodecs dnn flann 
-- OpenCV Root directory is: /usr/lib64/cmake/opencv4
-- OpenCV: Found version 4.5.3 (required: 3.3.0)
-- OpenCV headers: /usr/include/opencv4
-- OpenCV libs   : opencv_core;opencv_objdetect;opencv_imgproc;opencv_imgcodecs;opencv_dnn;opencv_flann
-- Found FLEX: /usr/bin/flex (found version "2.6.4") 
-- Found BISON: /usr/bin/bison (found version "3.7.5") 
-- Found LibXslt: /usr/lib64/libxslt.so (found version "1.1.34") 
-- Found LibXml2: /usr/lib64/libxml2.so (found version "2.9.10") 
-- Found Jasper: /usr/lib64/libjasper.so (found version "") 
-- Found Eigen3: /usr/include/eigen3 (Required is at least version "2.91.0") 
-- FIND IMAGEMAGICK API Magick++
-- -DMAGICKCORE_HDRI_ENABLE=1
-- -DMAGICKCORE_QUANTUM_DEPTH=16
-- FIND IMAGEMAGICK API MagickCore
-- -DMAGICKCORE_HDRI_ENABLE=1
-- -DMAGICKCORE_QUANTUM_DEPTH=16
-- FIND IMAGEMAGICK API MagickWand
-- -DMAGICKCORE_HDRI_ENABLE=1
-- -DMAGICKCORE_QUANTUM_DEPTH=16
-- Found ImageMagick: /usr/lib64/libMagick++.so (found version "7.0.10-62") 
-- ImageMagick_FOUND:                  	TRUE
-- ImageMagick_VERSION_STRING:         	7.0.10-62
-- ImageMagick_EXECUTABLE_DIR:         	/usr/bin
-- ImageMagick_INCLUDE_DIRS:           	/usr/include/ImageMagick-7
-- ImageMagick_LIBRARIES:              	/usr/lib64/libMagick++.so;/usr/lib64/libMagickCore.so;/usr/lib64/libMagickWand.so
-- ImageMagick_DEFINITIONS:            	-DMAGICKCORE_HDRI_ENABLE=1;-DMAGICKCORE_QUANTUM_DEPTH=16
-- ImageMagick_Magick++_INCLUDE_DIRS:	/usr/include/ImageMagick-7
-- ImageMagick_Magick++_LIBRARY:     	/usr/lib64/libMagick++.so
-- ImageMagick_Magick++_DEFINITIONS: 	-DMAGICKCORE_HDRI_ENABLE=1;-DMAGICKCORE_QUANTUM_DEPTH=16
-- ImageMagick_MagickCore_INCLUDE_DIRS:	/usr/include/ImageMagick-7
-- ImageMagick_MagickCore_LIBRARY:     	/usr/lib64/libMagickCore.so
-- ImageMagick_MagickCore_DEFINITIONS: 	-DMAGICKCORE_HDRI_ENABLE=1;-DMAGICKCORE_QUANTUM_DEPTH=16
-- ImageMagick_MagickWand_INCLUDE_DIRS:	/usr/include/ImageMagick-7
-- ImageMagick_MagickWand_LIBRARY:     	/usr/lib64/libMagickWand.so
-- ImageMagick_MagickWand_DEFINITIONS: 	-DMAGICKCORE_HDRI_ENABLE=1;-DMAGICKCORE_QUANTUM_DEPTH=16
-- OpenGL found;                                 TRUE
-- OpenGL GLU extension found;                   YES
-- OpenGL Qt6 found;           1
-- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) 
-- Checking for module 'lqr-1'
--   Found lqr-1, version 0.4.2
-- Found GLIB2: /usr/lib64/libglib-2.0.so  
-- Performing Test HAVE_LQR_0_4
-- Performing Test HAVE_LQR_0_4 - Failed
-- Found Lqr-1: /usr/include/lqr-1;/usr/include/glib-2.0;/usr/lib64/glib-2.0/include  
-- Found Gphoto2: /usr/lib64/libgphoto2.so  
-- libgphoto2 found    : TRUE
-- libgphoto2 version  : 2.5.26
-- libgphoto2 includes : /usr/include/gphoto2
-- libgphoto2 libraries: /usr/lib64/libgphoto2.so;/usr/lib64/libgphoto2_port.so;/usr/lib64/libusb-1.0.so
-- libgphoto2 API version >= 2.5
-- Checking for module 'lensfun'
--   Found lensfun, version 0.3.95.0
-- Found LensFun: /usr/include/lensfun (found version "0.3.95.0") 
-- liblensfun: Found version 0.3.95.0 (required: 0.2.6.0)
-- 
-- --------------------------------------------------
-- digiKam RawEngine dependencies checks:
-- 
-- Looking for OpenMP
-- Found OpenMP_C: -fopenmp (found version "4.5") 
-- Found OpenMP_CXX: -fopenmp (found version "4.5") 
-- Found OpenMP: TRUE (found version "4.5")  
-- OpenMP found with CXX flags: -fopenmp
-- RawEngine will be compiled with OpenMP support
-- RawEngine will be compiled with RedCine codec
-- Looking for LibJpeg
-- RawEngine will be compiled with DNG lossy codec
-- Looking for PThreads
-- --------------------------------------------------
-- 
-- 
-- ----------------------------------------------------------------------------------
--  digiKam 7.6.0 dependencies results   <https://www.digikam.org>
-- 
--  MySQL Database Support will be compiled.. YES (optional)
--  MySQL Internal Support will be compiled.. YES (optional)
--  DBUS Support will be compiled............ NO  (optional)
--  App. Style Support will be compiled...... YES (optional)
--  QWebEngine Support will be compiled...... NO  (optional)
--  libboostgraph found...................... YES
--  libexiv2 found........................... YES
--  libexpat found........................... YES
--  libjpeg found............................ YES
--  libkde found............................. YES
--  liblcms found............................ YES
--  libopencv found.......................... YES
--  libpng found............................. YES
--  libpthread found......................... YES
--  libqt found.............................. YES
--  libtiff found............................ YES
--  bison found.............................. YES (optional)
--  doxygen found............................ NO  (optional)
--  digiKam will be compiled without API documentation building support.
--  Please install the doxygen (version >= 1.8.0) development package.
-- 
--  ccache found............................. NO  (optional)
--  digiKam will be compiled without CCACHE build support.
--  Please install the ccache (version >= 3.0.0) development package.
-- 
--  flex found............................... YES (optional)
--  libakonadicontact found.................. NO  (optional)
--  digiKam will be compiled without KDE desktop address book support.
--  Please install the libakonadicontact (version >= 4.89.0) development package.
-- 
--  libmagick++ found........................ YES (optional)
--  libeigen3 found.......................... YES (optional)
--  libgphoto2 found......................... YES (optional)
--  libjasper found.......................... YES (optional)
--  libkcalendarcore found................... YES (optional)
--  libkfilemetadata found................... NO  (optional)
--  digiKam will be compiled without KDE desktop file metadata support.
--  Please install the libkfilemetadata (version >= 5.5.0) development package.
-- 
--  libkiconthemes found..................... YES (optional)
--  libkio found............................. YES (optional)
--  libknotifications found.................. YES (optional)
--  libknotifyconfig found................... YES (optional)
--  libksane found........................... NO  (optional)
--  digiKam will be compiled without flat scanners support.
--  Please install the libksane (version >= 5.5.0) development package.
-- 
--  liblensfun found......................... YES (optional)
--  liblqr-1 found........................... YES (optional)
--  libmarble found.......................... NO  (optional)
--  digiKam will be compiled without geolocation maps support.
--  Please install the libmarble (version >= 0.22.0) development package.
-- 
--  libqtav found............................ YES (optional)
--  libthreadweaver found.................... YES (optional)
--  libxml2 found............................ YES (optional)
--  libxslt found............................ YES (optional)
--  libx265 found............................ YES (optional)
--  OpenGL found............................. YES (optional)
--  digiKam can be compiled.................. YES
-- ----------------------------------------------------------------------------------
-- 
-- Using ccache to speed-up compilations..... NO
-- Remove GCC compiler option -pedantic from /home/gilles/Documents/7.x/core
-- Remove GCC compiler option -Wsuggest-override from /home/gilles/Documents/7.x/core
-- Remove GCC compiler option -Wcast-align from /home/gilles/Documents/7.x/core
-- Remove GCC compiler option -Wzero-as-null-pointer-constant from /home/gilles/Documents/7.x/core
-- Disable GCC compiler option -Wno-deprecated-copy from /home/gilles/Documents/7.x/core
-- Disable GCC compiler option -Wno-deprecated from /home/gilles/Documents/7.x/core/libs/metadataengine
-- Looking for posix_memalign
-- Looking for posix_memalign - found
-- Looking for malloc.h
-- Looking for malloc.h - found
-- Looking for stdint.h
-- Looking for stdint.h - found
-- Looking for stdbool.h
-- Looking for stdbool.h - found
-- Looking for inttypes.h
-- Looking for inttypes.h - found
-- Looking for stddef.h
-- Looking for stddef.h - found
-- Looking for strings.h
-- Looking for strings.h - found
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Remove GCC compiler option -Wcast-align from /home/gilles/Documents/7.x/core/libs/pgfutils
-- Remove GCC compiler option -Wzero-as-null-pointer-constant from /home/gilles/Documents/7.x/core/libs/pgfutils
-- Remove GCC compiler option -pedantic from /home/gilles/Documents/7.x/core/libs/dplugins/webservices
-- Remove GCC compiler option -Wundef from /home/gilles/Documents/7.x/core/libs/rawengine
-- Remove GCC compiler option -Werror=return-type from /home/gilles/Documents/7.x/core/libs/rawengine
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY - Success
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY - Success
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR - Success
-- WallPaper plugin will be compiled......... NO
-- Configuring done
-- Generating done
-- Build files have been written to: /home/gilles/Documents/7.x/build

[root@localhost 7.x]# 

Note : 
- KF6 is in fact KF5 code where plenty of patches are applied to support Qt6. It's compiled and installed with the official KDEsrcbuild git repository from gitlab. 
- Qtav compile fine with Qt6. This want mean that compilation tool chain is ok.
- Linux host is now Mageia8 to inherit of GCC10.
- Last stable cmake 3.22.2 is also installed in /opt/cmake.

Comment 18 caulier.gilles 2022-02-08 10:51:30 UTC

And now, the compilation is broken imediatly about forward declaration of Qt C++ class. I don't understand why, even if C+17 is mandatory to compile client Qt6 code. This is the trace :

[root@localhost build]# make
[  0%] Built target digikam-gitversion
[  0%] Built target digikam-builddate
[  0%] Automatic MOC for target core_dimg_obj
[  0%] Built target core_dimg_obj_autogen
[  0%] Building CXX object core/libs/dimg/CMakeFiles/core_dimg_obj.dir/core_dimg_obj_autogen/mocs_compilation.cpp.o
[  0%] Building CXX object core/libs/dimg/CMakeFiles/core_dimg_obj.dir/loaders/dimgloader.cpp.o
In file included from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:41,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/home/gilles/Documents/7.x/core/libs/threads/dynamicthread.h:38:7: error: template argument required for ‘class QMutexLocker’
   38 | class QMutexLocker;
      |       ^~~~~~~~~~~~
/home/gilles/Documents/7.x/core/libs/threads/dynamicthread.h:151:16: error: template placeholder type ‘QMutexLocker<...auto...>’ must be followed by a simple declarator-id
  151 |     void start(QMutexLocker& locker);
      |                ^~~~~~~~~~~~
In file included from /usr/include/QtCore/QMutex:1,
                 from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:31,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/usr/include/QtCore/qmutex.h:238:7: note: ‘template<class Mutex> class QMutexLocker’ declared here
  238 | class QMutexLocker
      |       ^~~~~~~~~~~~
In file included from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:41,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/home/gilles/Documents/7.x/core/libs/threads/dynamicthread.h:152:15: error: template placeholder type ‘QMutexLocker<...auto...>’ must be followed by a simple declarator-id
  152 |     void stop(QMutexLocker& locker);
      |               ^~~~~~~~~~~~
In file included from /usr/include/QtCore/QMutex:1,
                 from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:31,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/usr/include/QtCore/qmutex.h:238:7: note: ‘template<class Mutex> class QMutexLocker’ declared here
  238 | class QMutexLocker
      |       ^~~~~~~~~~~~
In file included from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:41,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/home/gilles/Documents/7.x/core/libs/threads/dynamicthread.h:153:15: error: template placeholder type ‘QMutexLocker<...auto...>’ must be followed by a simple declarator-id
  153 |     void wait(QMutexLocker& locker);
      |               ^~~~~~~~~~~~
In file included from /usr/include/QtCore/QMutex:1,
                 from /home/gilles/Documents/7.x/core/libs/threadimageio/fileio/loadsavethread.h:31,
                 from /home/gilles/Documents/7.x/core/libs/dimg/dimg_p.h:82,
                 from /home/gilles/Documents/7.x/core/libs/dimg/loaders/dimgloader.cpp:40:
/usr/include/QtCore/qmutex.h:238:7: note: ‘template<class Mutex> class QMutexLocker’ declared here
  238 | class QMutexLocker
      |       ^~~~~~~~~~~~
make[2]: *** [core/libs/dimg/CMakeFiles/core_dimg_obj.dir/build.make:90: core/libs/dimg/CMakeFiles/core_dimg_obj.dir/loaders/dimgloader.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:4834: core/libs/dimg/CMakeFiles/core_dimg_obj.dir/all] Error 2
make: *** [Makefile:136: all] Error 2

[root@localhost build]# 

If i insert "#include <QMutexLocker>" instead forward declaration "class QMutexLocker", the compilation pass until the next similar error in another place...

Gilles

Comment 19 Maik Qualmann 2022-02-08 12:33:30 UTC

QMutexLocker need a template, for example this is valid:

QMutexLocker locker(&mutex);

otherwise:

QMutexLocker<QMutex> locker;

Maik

Comment 20 Maik Qualmann 2022-02-08 12:41:26 UTC

On Qt-5.x.x this was possible:

QMutexLocker locker;

now with C++17:

QMutexLocker<QMutex> locker;

Maik

Comment 21 caulier.gilles 2022-02-08 13:38:55 UTC

Ok, now i understand the problem.

The Q is : Anjani do not have already fixed this syntax during Google event ?

Comment 22 caulier.gilles 2022-02-08 18:28:38 UTC

Git commit 1030949990cb4aab689904775c94c0e998ee0044 by Gilles Caulier.
Committed on 08/02/2022 at 18:25.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +9    -0    core/app/utils/digikam_globals_p.h
M  +1    -1    core/dplugins/generic/tools/printcreator/wizard/advprintphotopage.cpp
M  +1    -4    core/libs/dimg/filters/auto/autoexpofilter.cpp
M  +1    -4    core/libs/dimg/filters/auto/autolevelsfilter.cpp
M  +1    -4    core/libs/dimg/filters/auto/equalizefilter.cpp
M  +1    -4    core/libs/dimg/filters/auto/normalizefilter.cpp
M  +1    -4    core/libs/dimg/filters/auto/stretchfilter.cpp
M  +1    -4    core/libs/dimg/filters/bcg/bcgfilter.cpp
M  +1    -4    core/libs/dimg/filters/bw/bwsepiafilter.cpp
M  +1    -5    core/libs/dimg/filters/bw/infraredfilter.cpp
M  +1    -4    core/libs/dimg/filters/bw/mixerfilter.cpp
M  +1    -4    core/libs/dimg/filters/bw/tonalityfilter.cpp
M  +1    -4    core/libs/dimg/filters/cb/cbfilter.cpp
M  +1    -4    core/libs/dimg/filters/curves/curvesfilter.cpp
M  +1    -4    core/libs/dimg/filters/decorate/borderfilter.cpp
M  +1    -5    core/libs/dimg/filters/decorate/texturefilter.cpp
M  +1    -9    core/libs/dimg/filters/dimgbuiltinfilter.cpp
M  +1    -4    core/libs/dimg/filters/film/filmfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/blurfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/blurfxfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/charcoalfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/colorfxfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/distortionfxfilter.cpp
M  +1    -5    core/libs/dimg/filters/fx/embossfilter.cpp
M  +1    -5    core/libs/dimg/filters/fx/filmgrainfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/invertfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/oilpaintfilter.cpp
M  +1    -4    core/libs/dimg/filters/fx/raindropfilter.cpp
M  +1    -4    core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
M  +1    -4    core/libs/dimg/filters/hotpixels/hotpixelfixer.cpp
M  +1    -4    core/libs/dimg/filters/hsl/hslfilter.cpp
M  +1    -4    core/libs/dimg/filters/icc/icctransformfilter.cpp
M  +1    -4    core/libs/dimg/filters/lc/localcontrastfilter.cpp
M  +1    -4    core/libs/dimg/filters/lens/antivignettingfilter.cpp
M  +1    -4    core/libs/dimg/filters/lens/lensdistortionfilter.cpp
M  +1    -4    core/libs/dimg/filters/lens/lensfunfilter.cpp
M  +1    -4    core/libs/dimg/filters/levels/levelsfilter.cpp
M  +1    -4    core/libs/dimg/filters/nr/nrfilter.cpp
M  +1    -4    core/libs/dimg/filters/raw/rawprocessingfilter.cpp
M  +1    -4    core/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
M  +1    -4    core/libs/dimg/filters/sharp/refocusfilter.cpp
M  +1    -4    core/libs/dimg/filters/sharp/sharpenfilter.cpp
M  +1    -4    core/libs/dimg/filters/sharp/unsharpmaskfilter.cpp
M  +1    -4    core/libs/dimg/filters/transform/contentawarefilter.cpp
M  +1    -5    core/libs/dimg/filters/transform/freerotationfilter.cpp
M  +1    -5    core/libs/dimg/filters/transform/shearfilter.cpp
M  +1    -4    core/libs/dimg/filters/wb/wbfilter.cpp
M  +1    -1    core/libs/metadataengine/dmetadata/dmetadatasettingscontainer.cpp

https://invent.kde.org/graphics/digikam/commit/1030949990cb4aab689904775c94c0e998ee0044

Comment 23 caulier.gilles 2022-02-08 19:02:31 UTC

Git commit 7d6a95164c68935ce649f545083580078f86840a by Gilles Caulier.
Committed on 08/02/2022 at 18:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port ++

M  +2    -1    core/app/views/sidebar/albumfolderviewsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/datefolderviewsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/fuzzysearchsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/gpssearchsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/labelssidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/peoplesidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/searchsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/tagviewsidebarwidget.cpp
M  +2    -1    core/app/views/sidebar/timelinesidebarwidget.cpp
M  +2    -1    core/app/views/stack/itemiconview.cpp
M  +2    -1    core/dplugins/bqm/enhance/lensautofix/lensautofix.cpp
M  +2    -1    core/dplugins/generic/metadata/geolocationedit/kmlexport/kmlwidget.cpp
M  +2    -1    core/dplugins/generic/tools/expoblending/blendingdlg/enfusesettings.cpp
M  +2    -1    core/dplugins/generic/tools/expoblending/blendingdlg/expoblendingdlg.cpp
M  +2    -1    core/dplugins/generic/tools/mediaserver/dmediaserverdlg.cpp
M  +2    -1    core/dplugins/generic/tools/mjpegstream/mjpegstreamdlg.cpp
M  +2    -1    core/dplugins/generic/tools/sendbymail/wizard/mailsettingspage.cpp
M  +2    -1    core/dplugins/generic/tools/wallpaper/wallpaperplugindlg.cpp
M  +2    -1    core/dplugins/generic/view/slideshow/dialogs/setupslideshow_dialog.cpp
M  +2    -1    core/dplugins/generic/view/slideshow/widgets/slideerror.cpp
M  +2    -1    core/dplugins/generic/webservices/filecopy/fcexportwidget.cpp
M  +2    -1    core/dplugins/generic/webservices/google/gsnewalbumdlg.cpp
M  +2    -1    core/dplugins/generic/webservices/mediawiki/mediawikiwidget.cpp
M  +2    -1    core/dplugins/generic/webservices/smugmug/smugnewalbumdlg.cpp
M  +2    -1    core/dplugins/generic/webservices/smugmug/smugwidget.cpp
M  +2    -1    core/libs/dialogs/deletedialog.cpp
M  +2    -1    core/libs/dimg/filters/bcg/bcgsettings.cpp
M  +2    -1    core/libs/dimg/filters/bw/mixersettings.cpp
M  +2    -1    core/libs/dimg/filters/cb/cbsettings.cpp
M  +2    -1    core/libs/dimg/filters/decorate/bordersettings.cpp
M  +2    -1    core/libs/dimg/filters/decorate/texturesettings.cpp
M  +2    -1    core/libs/dimg/filters/hotpixels/hotpixelsettings.cpp
M  +2    -1    core/libs/dimg/filters/hsl/hslsettings.cpp
M  +2    -1    core/libs/dimg/filters/lc/localcontrastsettings.cpp
M  +2    -1    core/libs/dimg/filters/lens/antivignettingsettings.cpp
M  +2    -1    core/libs/dimg/filters/nr/nrsettings.cpp
M  +2    -1    core/libs/dimg/filters/redeye/redeyecorrectionsettings.cpp
M  +2    -1    core/libs/dimg/filters/sharp/sharpsettings.cpp
M  +2    -1    core/libs/dimg/filters/transform/freerotationsettings.cpp
M  +2    -1    core/libs/dimg/filters/wb/wbsettings.cpp
M  +2    -1    core/libs/dngwriter/dngsettings.cpp
M  +2    -1    core/libs/dplugins/setup/dpluginsetup.cpp
M  +2    -1    core/libs/dplugins/widgets/ditemslist.cpp
M  +2    -1    core/libs/dplugins/widgets/dwizardpage.cpp
M  +2    -1    core/libs/properties/captions/itemdescedittab.cpp
M  +2    -1    core/libs/properties/import/importitempropertiestab.cpp
M  +2    -1    core/libs/properties/itempropertiescolorstab.cpp
M  +2    -1    core/libs/tags/manager/tagpropwidget.cpp
M  +2    -1    core/libs/tags/widgets/tageditdlg.cpp
M  +2    -1    core/libs/timeadjust/timeadjustsettings.cpp
M  +2    -1    core/libs/video/player/mediaplayerview.cpp
M  +2    -1    core/libs/widgets/files/filesaveconflictbox.cpp
M  +2    -1    core/libs/widgets/mainview/fullscreensettings.cpp
M  +2    -1    core/libs/widgets/metadata/config/metadataselector.cpp
M  +2    -1    core/libs/widgets/metadata/exiftool/exiftoolerrorview.cpp
M  +2    -1    core/libs/widgets/metadata/exiftool/exiftoolloadingview.cpp
M  +2    -1    core/libs/widgets/metadata/exiftool/exiftoolwidget.cpp
M  +2    -1    core/showfoto/main/showfoto_setup.cpp
M  +2    -1    core/showfoto/setup/showfotosetupmetadata.cpp
M  +2    -1    core/showfoto/setup/showfotosetuptooltip.cpp
M  +2    -1    core/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp
M  +2    -1    core/utilities/advancedrename/parser/options/database/dbkeyselector.cpp
M  +2    -1    core/utilities/firstrun/metadatapage.cpp
M  +2    -1    core/utilities/firstrun/migratefromdigikam4page.cpp
M  +2    -1    core/utilities/firstrun/openfilepage.cpp
M  +2    -1    core/utilities/firstrun/previewpage.cpp
M  +2    -1    core/utilities/firstrun/rawpage.cpp
M  +2    -1    core/utilities/firstrun/tooltipspage.cpp
M  +2    -1    core/utilities/fuzzysearch/fuzzysearchview.cpp
M  +2    -1    core/utilities/imageeditor/editor/editortoolsettings.cpp
M  +2    -1    core/utilities/import/dialogs/camerafolderdialog.cpp
M  +2    -1    core/utilities/import/widgets/dngconvertsettings.cpp
M  +2    -1    core/utilities/setup/album/setupalbumview.cpp
M  +2    -1    core/utilities/setup/album/setupcategory.cpp
M  +2    -1    core/utilities/setup/album/setupmime.cpp
M  +2    -1    core/utilities/setup/camera/cameraselection.cpp
M  +2    -1    core/utilities/setup/camera/setupcamera.cpp
M  +2    -1    core/utilities/setup/collections/setupcollections.cpp
M  +2    -1    core/utilities/setup/editor/setupeditoriface.cpp
M  +2    -1    core/utilities/setup/setupdatabase.cpp
M  +2    -1    core/utilities/setup/setupicc.cpp
M  +2    -1    core/utilities/setup/setuplighttable.cpp
M  +2    -1    core/utilities/setup/setuptemplate.cpp
M  +2    -1    core/utilities/setup/setuptooltip.cpp
M  +2    -1    core/utilities/setup/system/systemsettingswidget.cpp

https://invent.kde.org/graphics/digikam/commit/7d6a95164c68935ce649f545083580078f86840a

Comment 24 caulier.gilles 2022-02-09 08:27:10 UTC

Git commit 4ffb7169fafc42d1cfae5c06034e92777fb1fb66 by Gilles Caulier.
Committed on 09/02/2022 at 08:27.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +10   -4    core/libs/dimg/filters/icc/iccsettings.cpp

https://invent.kde.org/graphics/digikam/commit/4ffb7169fafc42d1cfae5c06034e92777fb1fb66

Comment 25 caulier.gilles 2022-02-09 09:00:54 UTC

Git commit 9672d7434ec90ae506be9bca7d598838a2132aa9 by Gilles Caulier.
Committed on 09/02/2022 at 08:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +8    -3    core/dplugins/generic/tools/expoblending/manager/expoblendingthread.cpp
M  +8    -1    core/dplugins/generic/tools/mjpegstream/mjpegserver_p.cpp
M  +9    -3    core/libs/dimg/filters/lc/localcontrastfilter.cpp
M  +8    -3    core/libs/dimg/filters/lens/lensfunfilter.cpp
M  +9    -4    core/libs/dimg/filters/nr/nrfilter.cpp
M  +8    -3    core/libs/dimg/filters/sharp/refocusfilter.cpp
M  +8    -2    core/libs/dimg/filters/sharp/sharpenfilter.cpp
M  +8    -3    core/libs/dimg/filters/sharp/unsharpmaskfilter.cpp

https://invent.kde.org/graphics/digikam/commit/9672d7434ec90ae506be9bca7d598838a2132aa9

Comment 26 caulier.gilles 2022-02-09 09:06:21 UTC

Git commit 35fc779f6a08224f9d32aefc7b937899dfe4b966 by Gilles Caulier.
Committed on 09/02/2022 at 09:03.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +18   -6    core/libs/dimg/filters/lc/localcontrastfilter.cpp

https://invent.kde.org/graphics/digikam/commit/35fc779f6a08224f9d32aefc7b937899dfe4b966

Comment 27 caulier.gilles 2022-02-09 09:07:52 UTC

Git commit 7cc87238c9464843fe798fb87fdbbcd6dba390bb by Gilles Caulier.
Committed on 09/02/2022 at 09:05.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +8    -3    core/libs/dimg/filters/lc/localcontrastfilter.cpp

https://invent.kde.org/graphics/digikam/commit/7cc87238c9464843fe798fb87fdbbcd6dba390bb

Comment 28 caulier.gilles 2022-02-09 09:09:34 UTC

Git commit c6ab58b904487a4359821f6c52f5f6a19f914721 by Gilles Caulier.
Committed on 09/02/2022 at 09:07.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +8    -3    core/libs/dimg/filters/nr/nrfilter.cpp

https://invent.kde.org/graphics/digikam/commit/c6ab58b904487a4359821f6c52f5f6a19f914721

Comment 29 caulier.gilles 2022-02-09 09:13:43 UTC

Git commit 44a7c2694296ebc874aaf369b5c652f9a11d62a6 by Gilles Caulier.
Committed on 09/02/2022 at 09:11.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +0    -1    core/libs/dimg/filters/sharp/sharpenfilter.cpp

https://invent.kde.org/graphics/digikam/commit/44a7c2694296ebc874aaf369b5c652f9a11d62a6

Comment 30 caulier.gilles 2022-02-09 09:31:28 UTC

Git commit b069dcf286a48b9e89682d15ef5e3e069f099e3c by Gilles Caulier.
Committed on 09/02/2022 at 09:29.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -1    core/dplugins/generic/metadata/metadataedit/dialog/altlangstringedit.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/dialog/multistringsedit.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/dialog/multivaluesedit.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/dialog/objectattributesedit.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exifadjust.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exifcaption.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exifdatetime.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exifdevice.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exiflens.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/exif/exiflight.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptccategories.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptccontent.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptccredits.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptcenvelope.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptckeywords.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptcorigin.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptcproperties.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/iptc/iptcstatus.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/xmp/xmpcategories.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/xmp/xmpkeywords.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/xmp/xmporigin.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/xmp/xmpproperties.cpp
M  +2    -1    core/dplugins/generic/metadata/metadataedit/xmp/xmpstatus.cpp
M  +2    -1    core/dplugins/generic/tools/htmlgallery/wizard/htmlfinalpage.cpp
M  +6    -3    core/dplugins/generic/tools/htmlgallery/wizard/htmlimagesettingspage.cpp
M  +2    -1    core/dplugins/generic/tools/htmlgallery/wizard/htmloutputpage.cpp
M  +4    -2    core/dplugins/generic/tools/htmlgallery/wizard/htmlparameterspage.cpp
M  +2    -1    core/dplugins/generic/tools/htmlgallery/wizard/htmlthemepage.cpp
M  +2    -1    core/dplugins/generic/tools/jalbum/wizard/jalbumfinalpage.cpp
M  +2    -1    core/dplugins/generic/tools/jalbum/wizard/jalbumoutputpage.cpp
M  +2    -1    core/dplugins/generic/tools/printcreator/wizard/advprintfinalpage.cpp
M  +2    -1    core/dplugins/generic/tools/printcreator/wizard/advprintoutputpage.cpp
M  +2    -1    core/dplugins/generic/tools/sendbymail/wizard/mailfinalpage.cpp
M  +2    -1    core/dplugins/generic/tools/videoslideshow/wizard/vidslidefinalpage.cpp
M  +2    -1    core/dplugins/generic/tools/videoslideshow/wizard/vidslideoutputpage.cpp
M  +6    -3    core/dplugins/generic/tools/videoslideshow/wizard/vidslidevideopage.cpp
M  +2    -1    core/dplugins/generic/view/slideshow/widgets/slideosd.cpp
M  +2    -1    core/dplugins/generic/webservices/filetransfer/ftexportwidget.cpp
M  +2    -1    core/dplugins/generic/webservices/filetransfer/ftimportwidget.cpp
M  +2    -1    core/dplugins/generic/webservices/inaturalist/inatbrowserdlg.cpp
M  +2    -1    core/dplugins/generic/webservices/unified/wizard/wsfinalpage.cpp
M  +4    -2    core/dplugins/generic/webservices/unified/wizard/wssettingspage.cpp
M  +2    -1    core/libs/album/widgets/albumpropsedit.cpp
M  +2    -1    core/libs/album/widgets/albumselectdialog.cpp
M  +8    -4    core/libs/album/widgets/albumselecttabs.cpp
M  +2    -1    core/libs/album/widgets/albumselectwidget.cpp
M  +2    -1    core/libs/dialogs/imagedialog_preview.cpp
M  +2    -1    core/libs/dialogs/infodlg.cpp
M  +2    -1    core/libs/dialogs/webbrowserdlg.cpp
M  +2    -1    core/libs/dimg/filters/curves/curvesbox.cpp
M  +2    -1    core/libs/dimg/filters/curves/curvessettings.cpp
M  +2    -1    core/libs/dimg/filters/lens/lensfuncameraselector.cpp
M  +2    -1    core/libs/dplugins/setup/dpluginaboutdlg.cpp
M  +2    -1    core/libs/fileactionmanager/metadatastatusbar.cpp
M  +2    -1    core/libs/filters/filterstatusbar.cpp
M  +2    -1    core/libs/template/templateselector.cpp
M  +2    -1    core/libs/video/player/vidplayerdlg.cpp
M  +2    -1    core/libs/widgets/combo/dcombobox.cpp
M  +2    -1    core/libs/widgets/files/filesaveoptionsbox.cpp
M  +2    -1    core/libs/widgets/fonts/dfontselect.cpp
M  +3    -1    core/libs/widgets/itemview/actioncategorizedview.cpp
M  +2    -1    core/libs/widgets/layout/dexpanderbox.cpp
M  +2    -1    core/libs/widgets/metadata/exiv2/metadatalistview.cpp
M  +2    -1    core/libs/widgets/metadata/exiv2/metadatawidget.cpp
M  +2    -1    core/libs/widgets/metadata/utils/altlangstredit.cpp
M  +4    -2    core/libs/widgets/metadata/utils/subjectwidget.cpp
M  +4    -2    core/libs/widgets/range/dnuminput.cpp
M  +2    -1    core/utilities/firstrun/collectionpage.cpp
M  +6    -3    core/utilities/geolocation/mapsearches/gpssearchview.cpp
M  +2    -1    core/utilities/queuemanager/views/workflowdlg.cpp

https://invent.kde.org/graphics/digikam/commit/b069dcf286a48b9e89682d15ef5e3e069f099e3c

Comment 31 caulier.gilles 2022-02-09 09:41:35 UTC

Git commit 26c13a46de447ec4dc8ba7d5cbfb3905fa4c2ee0 by Gilles Caulier.
Committed on 09/02/2022 at 09:39.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -2    core/libs/dimg/filters/imgqsort/imagequalitycontainer.cpp

https://invent.kde.org/graphics/digikam/commit/26c13a46de447ec4dc8ba7d5cbfb3905fa4c2ee0

Comment 32 caulier.gilles 2022-02-09 09:46:19 UTC

Git commit aafc4aa1c21a7bd747079fae30789064009929fe by Gilles Caulier.
Committed on 09/02/2022 at 09:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +16   -6    core/libs/dimg/filters/lens/lensfunfilter.cpp

https://invent.kde.org/graphics/digikam/commit/aafc4aa1c21a7bd747079fae30789064009929fe

Comment 33 caulier.gilles 2022-02-09 09:47:57 UTC

Git commit 89c63baaea123c67797ba2c03aa6eaa344a18082 by Gilles Caulier.
Committed on 09/02/2022 at 09:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +6    -6    core/libs/dimg/filters/lens/lensfunfilter.cpp

https://invent.kde.org/graphics/digikam/commit/89c63baaea123c67797ba2c03aa6eaa344a18082

Comment 34 caulier.gilles 2022-02-09 09:48:58 UTC

Git commit efbeb28af427871c4030f55f36214db6b7ede48f by Gilles Caulier.
Committed on 09/02/2022 at 09:46.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/dimg/filters/lens/lensfuncameraselector.cpp

https://invent.kde.org/graphics/digikam/commit/efbeb28af427871c4030f55f36214db6b7ede48f

Comment 35 caulier.gilles 2022-02-09 09:52:48 UTC

Git commit 58df1a59ce8c81587a0b3a8f7a7f0456a55769a7 by Gilles Caulier.
Committed on 09/02/2022 at 09:50.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +6    -0    core/libs/dimg/filters/lens/lensfuncameraselector.cpp

https://invent.kde.org/graphics/digikam/commit/58df1a59ce8c81587a0b3a8f7a7f0456a55769a7

Comment 36 caulier.gilles 2022-02-09 09:55:09 UTC

Git commit 192ff1f3bdff2ca1b956c19849499be8485df497 by Gilles Caulier.
Committed on 09/02/2022 at 09:52.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +6    -0    core/libs/dimg/filters/lens/lensfuncameraselector.cpp

https://invent.kde.org/graphics/digikam/commit/192ff1f3bdff2ca1b956c19849499be8485df497

Comment 37 caulier.gilles 2022-02-09 10:05:16 UTC

Git commit 46cd95e7650abcec3c4496e04b1dc6d43bb53f85 by Gilles Caulier.
Committed on 09/02/2022 at 10:02.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -1    core/libs/dimg/filters/lens/lensfuniface.cpp

https://invent.kde.org/graphics/digikam/commit/46cd95e7650abcec3c4496e04b1dc6d43bb53f85

Comment 38 caulier.gilles 2022-02-09 10:08:05 UTC

Git commit 7e5293daa147d8d800d15298619e9de68fe06857 by Gilles Caulier.
Committed on 09/02/2022 at 10:05.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/dimg/filters/lens/lensfuniface.cpp

https://invent.kde.org/graphics/digikam/commit/7e5293daa147d8d800d15298619e9de68fe06857

Comment 39 caulier.gilles 2022-02-09 10:08:29 UTC

Git commit ca9c490f83b7297deaae9852a56a95d8eb872a34 by Gilles Caulier.
Committed on 09/02/2022 at 10:06.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/dimg/filters/lens/lensfuniface.cpp

https://invent.kde.org/graphics/digikam/commit/ca9c490f83b7297deaae9852a56a95d8eb872a34

Comment 40 caulier.gilles 2022-02-09 10:18:16 UTC

Git commit 4c575821eb8998bcfd3b23d713ed965ca81e4320 by Gilles Caulier.
Committed on 09/02/2022 at 10:15.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/metadataengine/engine/metaengine_p.cpp
M  +1    -0    core/libs/metadataengine/engine/metaengine_p.h

https://invent.kde.org/graphics/digikam/commit/4c575821eb8998bcfd3b23d713ed965ca81e4320

Comment 41 caulier.gilles 2022-02-09 10:18:52 UTC

Git commit daa3232542ca8c62c6b746431fedc88787de6ca3 by Gilles Caulier.
Committed on 09/02/2022 at 10:16.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/metadataengine/engine/metaengine_p.cpp

https://invent.kde.org/graphics/digikam/commit/daa3232542ca8c62c6b746431fedc88787de6ca3

Comment 42 caulier.gilles 2022-02-09 10:19:30 UTC

Git commit 74eda6e758c78eac5bd330f3eb15f65cbb2e7afa by Gilles Caulier.
Committed on 09/02/2022 at 10:17.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/libs/metadataengine/engine/metaengine_p.h

https://invent.kde.org/graphics/digikam/commit/74eda6e758c78eac5bd330f3eb15f65cbb2e7afa

Comment 43 caulier.gilles 2022-02-09 10:22:51 UTC

Git commit 1ac057e377eeaeb15cc517bcc365ac5c24022187 by Gilles Caulier.
Committed on 09/02/2022 at 10:20.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/libs/metadataengine/engine/metaengine_fileio.cpp

https://invent.kde.org/graphics/digikam/commit/1ac057e377eeaeb15cc517bcc365ac5c24022187

Comment 44 caulier.gilles 2022-02-09 10:24:37 UTC

Git commit 1d5eddbb85e7d0395d9f0a2d8df34265da604a0e by Gilles Caulier.
Committed on 09/02/2022 at 10:22.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: min Qt5 version to be compatible with Qt6 API: 5.14.0

M  +1    -1    core/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/1d5eddbb85e7d0395d9f0a2d8df34265da604a0e

Comment 45 caulier.gilles 2022-02-09 11:04:38 UTC

Git commit 00b7b66a475d2e3926c492cbe1397a3134c79ecc by Gilles Caulier.
Committed on 09/02/2022 at 10:57.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -4    core/libs/metadataengine/dmetadata/dmetadata_faces.cpp

https://invent.kde.org/graphics/digikam/commit/00b7b66a475d2e3926c492cbe1397a3134c79ecc

Comment 46 caulier.gilles 2022-02-09 11:06:22 UTC

Git commit 747a25ac90ecacc5468aa11bee80acf8852766c9 by Gilles Caulier.
Committed on 09/02/2022 at 10:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +18   -18   Mainpage.dox

https://invent.kde.org/graphics/digikam/commit/747a25ac90ecacc5468aa11bee80acf8852766c9

Comment 47 caulier.gilles 2022-02-09 11:34:57 UTC

Git commit 7a99026197a139620ff280747177b70bee9d186a by Gilles Caulier.
Committed on 09/02/2022 at 11:32.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: Qt6::QVariant do not support QMultiMap. So faces map to QVariant will be empty until we found a solution. By chance, this conversion is not yet used in digiKam core

M  +10   -2    core/libs/metadataengine/dmetadata/dmetadata_generic.cpp

https://invent.kde.org/graphics/digikam/commit/7a99026197a139620ff280747177b70bee9d186a

Comment 48 caulier.gilles 2022-02-09 11:49:11 UTC

Git commit b833a4c200a3c9ba97579c59cee05b678f419bfd by Gilles Caulier.
Committed on 09/02/2022 at 11:46.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/metadataengine/dmetadata/dmetadata_generic.cpp

https://invent.kde.org/graphics/digikam/commit/b833a4c200a3c9ba97579c59cee05b678f419bfd

Comment 49 caulier.gilles 2022-02-09 11:52:05 UTC

Git commit 7b6461e10b425be48faa537400827e34a4604ff1 by Gilles Caulier.
Committed on 09/02/2022 at 11:49.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/metadataengine/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/7b6461e10b425be48faa537400827e34a4604ff1

Comment 50 caulier.gilles 2022-02-09 12:05:55 UTC

Git commit ea7d4eb66299eee249e6f8f02f6a91a4184c243a by Gilles Caulier.
Committed on 09/02/2022 at 12:03.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -5    core/libs/metadataengine/exiftool/exiftoolparser_command.cpp

https://invent.kde.org/graphics/digikam/commit/ea7d4eb66299eee249e6f8f02f6a91a4184c243a

Comment 51 caulier.gilles 2022-02-09 12:14:42 UTC

Git commit 0bce162663bb7d858ed21cde7b6b876e403f2e0e by Gilles Caulier.
Committed on 09/02/2022 at 12:12.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +7    -1    core/libs/database/engine/dbenginebackend.cpp

https://invent.kde.org/graphics/digikam/commit/0bce162663bb7d858ed21cde7b6b876e403f2e0e

Comment 52 caulier.gilles 2022-02-09 12:16:09 UTC

Git commit 8ab0c0cf5384b110d62720cfbf29d4e8247692c1 by Gilles Caulier.
Committed on 09/02/2022 at 12:13.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -0    core/libs/database/engine/dbenginebackend.cpp

https://invent.kde.org/graphics/digikam/commit/8ab0c0cf5384b110d62720cfbf29d4e8247692c1

Comment 53 caulier.gilles 2022-02-09 12:18:51 UTC

Git commit d3af5ef09a7b9329824f0143e49c065088ce8146 by Gilles Caulier.
Committed on 09/02/2022 at 12:16.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/database/thumbsdb/thumbsdbaccess.cpp

https://invent.kde.org/graphics/digikam/commit/d3af5ef09a7b9329824f0143e49c065088ce8146

Comment 54 caulier.gilles 2022-02-09 12:25:58 UTC

Git commit d552e7c22a1a378df32b101c7663dd022702d516 by Gilles Caulier.
Committed on 09/02/2022 at 12:23.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +6    -1    core/libs/database/thumbsdb/thumbsdbaccess.cpp
M  +12   -0    core/libs/threads/dynamicthread.cpp
M  +6    -0    core/libs/threads/dynamicthread.h

https://invent.kde.org/graphics/digikam/commit/d552e7c22a1a378df32b101c7663dd022702d516

Comment 55 caulier.gilles 2022-02-09 13:45:55 UTC

Git commit 70fbace9c75ad95b64ba1a930ed38d6f6b96a29d by Gilles Caulier.
Committed on 09/02/2022 at 13:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/database/thumbsdb/thumbsdbaccess.cpp

https://invent.kde.org/graphics/digikam/commit/70fbace9c75ad95b64ba1a930ed38d6f6b96a29d

Comment 56 caulier.gilles 2022-02-09 13:52:07 UTC

Git commit 7d7e930a9751b979dc90491c6999cfbcf20a8f71 by Gilles Caulier.
Committed on 09/02/2022 at 13:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +7    -1    core/libs/database/coredb/coredbaccess.cpp
M  +7    -1    core/libs/database/similaritydb/similaritydbaccess.cpp
M  +7    -1    core/libs/facesengine/facedb/facedbaccess.cpp

https://invent.kde.org/graphics/digikam/commit/7d7e930a9751b979dc90491c6999cfbcf20a8f71

Comment 57 caulier.gilles 2022-02-09 14:55:00 UTC

Git commit 98dc6a9a862ddc298e36c7880d13b6aecbc380b6 by Gilles Caulier.
Committed on 09/02/2022 at 14:52.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/database/tags/tagproperties.cpp
M  +2    -2    core/libs/database/tags/tagproperties.h

https://invent.kde.org/graphics/digikam/commit/98dc6a9a862ddc298e36c7880d13b6aecbc380b6

Comment 58 caulier.gilles 2022-02-09 14:59:21 UTC

Git commit 955450158fc39bcce2c948cae15bb6b0e422c48d by Gilles Caulier.
Committed on 09/02/2022 at 14:57.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/database/item/containers/itemtagpair.cpp
M  +2    -2    core/libs/database/item/containers/itemtagpair.h

https://invent.kde.org/graphics/digikam/commit/955450158fc39bcce2c948cae15bb6b0e422c48d

Comment 59 caulier.gilles 2022-02-09 15:23:38 UTC

Git commit 13a018474dde6d2698d4e90e25d64fc85a8bfda2 by Gilles Caulier.
Committed on 09/02/2022 at 15:21.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +15   -0    core/app/utils/digikam_globals.cpp
M  +13   -6    core/app/utils/digikam_globals.h
M  +0    -1    core/libs/database/item/lister/itemlister.cpp
M  +1    -0    core/libs/database/item/lister/itemlister_p.h

https://invent.kde.org/graphics/digikam/commit/13a018474dde6d2698d4e90e25d64fc85a8bfda2

Comment 60 caulier.gilles 2022-02-09 15:48:52 UTC

Git commit 602d957964efd75fc7cae60ddbed2d383bd8cf96 by Gilles Caulier.
Committed on 09/02/2022 at 15:46.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/libs/database/models/itemfiltersettings.cpp

https://invent.kde.org/graphics/digikam/commit/602d957964efd75fc7cae60ddbed2d383bd8cf96

Comment 61 caulier.gilles 2022-02-09 17:46:15 UTC

Git commit df6c942cb894f888df08545e2f89bc96bcf7bc5a by Gilles Caulier.
Committed on 09/02/2022 at 17:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +10   -7    core/libs/database/models/itemfiltersettings.cpp

https://invent.kde.org/graphics/digikam/commit/df6c942cb894f888df08545e2f89bc96bcf7bc5a

Comment 62 caulier.gilles 2022-02-09 17:50:25 UTC

Git commit 0866abeae4af2d428be22d1df25180e185b9ae19 by Gilles Caulier.
Committed on 09/02/2022 at 17:50.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

Maik, please double check this QRegExp to QRegularExpression port please...

M  +6    -6    core/libs/database/models/itemfiltersettings.cpp

https://invent.kde.org/graphics/digikam/commit/0866abeae4af2d428be22d1df25180e185b9ae19

Comment 63 caulier.gilles 2022-02-09 17:57:44 UTC

Git commit 3b8ba367c4fd6819328864b7a50793af116bab81 by Gilles Caulier.
Committed on 09/02/2022 at 17:55.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -5    core/libs/database/models/itemmodel.cpp

https://invent.kde.org/graphics/digikam/commit/3b8ba367c4fd6819328864b7a50793af116bab81

Comment 64 caulier.gilles 2022-02-09 18:01:06 UTC

Git commit 3aaf901c77ddb24ba27749ec25346fe5d23f05b4 by Gilles Caulier.
Committed on 09/02/2022 at 17:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +3    -3    core/libs/database/models/itemmodel.cpp

https://invent.kde.org/graphics/digikam/commit/3aaf901c77ddb24ba27749ec25346fe5d23f05b4

Comment 65 caulier.gilles 2022-02-09 18:19:35 UTC

Git commit 928f01e0a119bbfc539728dc215f5cbd67f8d6cb by Gilles Caulier.
Committed on 09/02/2022 at 18:19.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/database/haar/haariface.cpp

https://invent.kde.org/graphics/digikam/commit/928f01e0a119bbfc539728dc215f5cbd67f8d6cb

Comment 66 caulier.gilles 2022-02-09 19:48:15 UTC

Git commit c90df8ccc790b872e584a14522774a3a12bd3393 by Gilles Caulier.
Committed on 09/02/2022 at 19:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +3    -3    core/libs/facesengine/recognition/facialrecognition_wrapper_identity.cpp

https://invent.kde.org/graphics/digikam/commit/c90df8ccc790b872e584a14522774a3a12bd3393

Comment 67 caulier.gilles 2022-02-09 19:54:21 UTC

Git commit e03c243e00f35a274f5d2a62eb6a99d6478069a5 by Gilles Caulier.
Committed on 09/02/2022 at 19:52.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/facesengine/facedb/facedb_identity.cpp

https://invent.kde.org/graphics/digikam/commit/e03c243e00f35a274f5d2a62eb6a99d6478069a5

Comment 68 caulier.gilles 2022-02-09 20:00:35 UTC

Git commit 0e76d9da53efd8b1542bc2da953f306df1de4101 by Gilles Caulier.
Committed on 09/02/2022 at 19:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +0    -1    core/libs/threadimageio/preview/previewtask.cpp

https://invent.kde.org/graphics/digikam/commit/0e76d9da53efd8b1542bc2da953f306df1de4101

Comment 69 caulier.gilles 2022-02-09 20:00:53 UTC

Git commit f560d90d8cf431c7d2739d9d78ab9e48c664fd1c by Gilles Caulier.
Committed on 09/02/2022 at 19:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +0    -1    core/dplugins/generic/tools/calendar/wizard/calmonthwidget.cpp
M  +0    -1    core/dplugins/generic/view/presentation/common/presentationloader.cpp
M  +0    -1    core/dplugins/generic/view/presentation/opengl/kbimageloader.cpp
M  +0    -1    core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
M  +0    -1    core/libs/threadimageio/thumb/thumbnailtask.cpp
M  +0    -1    core/utilities/import/backend/umscamera.cpp

https://invent.kde.org/graphics/digikam/commit/f560d90d8cf431c7d2739d9d78ab9e48c664fd1c

Comment 70 caulier.gilles 2022-02-09 20:53:37 UTC

Git commit 7d865ccf270223be5ea6e08ef7a8cde95025c1a3 by Gilles Caulier.
Committed on 09/02/2022 at 20:51.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -4    core/libs/threadimageio/engine/dservicemenu_linux.cpp

https://invent.kde.org/graphics/digikam/commit/7d865ccf270223be5ea6e08ef7a8cde95025c1a3

Comment 71 caulier.gilles 2022-02-10 02:01:29 UTC

Git commit 8efb433def867f4e365f6e022b1a428c0e33f7aa by Gilles Caulier.
Committed on 10/02/2022 at 02:01.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/app/utils/digikam_globals_bundles.cpp
M  +4    -2    core/libs/properties/history/versionstreeview.cpp
M  +11   -1    core/libs/threadimageio/engine/dservicemenu_linux.cpp
M  +4    -4    core/libs/widgets/graphicsview/graphicsdimgview.cpp
M  +2    -2    core/libs/widgets/graphicsview/paniconwidget.cpp
M  +5    -2    core/libs/widgets/itemview/actioncategorizedview.cpp
M  +17   -10   core/libs/widgets/itemview/dcategorizedview.cpp
M  +2    -2    core/libs/widgets/itemview/ditemtooltip.cpp
M  +8    -4    core/libs/widgets/itemview/itemviewcategorized.cpp
M  +4    -0    core/libs/widgets/itemview/itemviewhoverbutton.cpp
M  +8    -3    core/libs/widgets/itemview/itemviewhoverbutton.h
M  +1    -1    core/libs/widgets/mainview/dcursortracker.cpp
M  +6    -6    core/libs/widgets/mainview/dxmlguiwindow_actions.cpp

https://invent.kde.org/graphics/digikam/commit/8efb433def867f4e365f6e022b1a428c0e33f7aa

Comment 72 caulier.gilles 2022-02-10 02:22:30 UTC

Git commit 1074f20e3e750b4fa71d98dc8202f480d060f403 by Gilles Caulier.
Committed on 10/02/2022 at 02:22.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -1    core/libs/widgets/colors/dcolorchoosermode.cpp
M  +1    -1    core/libs/widgets/colors/dcolorselector.cpp
M  +2    -1    core/libs/widgets/fonts/dfontproperties.cpp
M  +0    -1    core/libs/widgets/fonts/dfontproperties.h
M  +1    -0    core/libs/widgets/metadata/exiftool/exiftoolwidget.cpp

https://invent.kde.org/graphics/digikam/commit/1074f20e3e750b4fa71d98dc8202f480d060f403

Comment 73 caulier.gilles 2022-02-10 06:00:52 UTC

Git commit 0e9b3986d5ba2fdfc7951720bac4bfd52c72beb5 by Gilles Caulier.
Committed on 10/02/2022 at 05:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -2    core/libs/widgets/combo/squeezedcombobox.cpp
M  +1    -1    core/libs/widgets/layout/dexpanderbox.cpp
M  +6    -0    core/libs/widgets/layout/sidebar.cpp
M  +1    -2    core/libs/widgets/range/dsliderspinbox.cpp

https://invent.kde.org/graphics/digikam/commit/0e9b3986d5ba2fdfc7951720bac4bfd52c72beb5

Comment 74 caulier.gilles 2022-02-10 06:11:59 UTC

Git commit 6b15bba15f90f8d8586916a1246e3ed14ba876a7 by Gilles Caulier.
Committed on 10/02/2022 at 06:11.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -1    core/libs/notificationmanager/dnotificationpopup.cpp

https://invent.kde.org/graphics/digikam/commit/6b15bba15f90f8d8586916a1246e3ed14ba876a7

Comment 75 caulier.gilles 2022-02-10 07:34:53 UTC

Git commit 32181691badf9233722d899249e37aba0554d2c1 by Gilles Caulier.
Committed on 10/02/2022 at 07:34.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -0    core/libs/models/itemalbummodel.h

https://invent.kde.org/graphics/digikam/commit/32181691badf9233722d899249e37aba0554d2c1

Comment 76 caulier.gilles 2022-02-10 07:43:11 UTC

Git commit b520f0e2b41cf4ee7699dce241db0982ce9c5ef9 by Gilles Caulier.
Committed on 10/02/2022 at 07:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/onlineversion/onlineversiondlg.cpp

https://invent.kde.org/graphics/digikam/commit/b520f0e2b41cf4ee7699dce241db0982ce9c5ef9

Comment 77 caulier.gilles 2022-02-10 07:45:51 UTC

Git commit 5706933d943209b9c3eda928f91b35fa9ac553ce by Gilles Caulier.
Committed on 10/02/2022 at 07:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -1    core/libs/dialogs/dprogressdlg.cpp
M  +2    -1    core/libs/onlineversion/onlineversiondlg.cpp
M  +2    -1    core/utilities/maintenance/maintenancedlg.cpp

https://invent.kde.org/graphics/digikam/commit/5706933d943209b9c3eda928f91b35fa9ac553ce

Comment 78 caulier.gilles 2022-02-10 07:58:30 UTC

Git commit e72e93f6e31ce066cbda442b5d2d78a6aef4ad9d by Gilles Caulier.
Committed on 10/02/2022 at 07:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -6    bootstrap.qt6
M  +2    -2    core/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/e72e93f6e31ce066cbda442b5d2d78a6aef4ad9d

Comment 79 caulier.gilles 2022-02-10 08:01:56 UTC

Git commit 12d1bc36be2e0fac134ab03e4799c46e38dba5ea by Gilles Caulier.
Committed on 10/02/2022 at 07:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -1    core/libs/dialogs/libsinfodlg.cpp

https://invent.kde.org/graphics/digikam/commit/12d1bc36be2e0fac134ab03e4799c46e38dba5ea

Comment 80 caulier.gilles 2022-02-10 08:18:49 UTC

Git commit 1aaf40cf4311f18efb3eae532353aa9bfc4b4ee3 by Gilles Caulier.
Committed on 10/02/2022 at 08:16.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +22   -1    core/libs/dialogs/webbrowserdlg.cpp

https://invent.kde.org/graphics/digikam/commit/1aaf40cf4311f18efb3eae532353aa9bfc4b4ee3

Comment 81 caulier.gilles 2022-02-10 08:20:53 UTC

Git commit 0effed0394c9f87800343f6de233aa122dfe634b by Gilles Caulier.
Committed on 10/02/2022 at 08:20.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/dialogs/webbrowserdlg.cpp

https://invent.kde.org/graphics/digikam/commit/0effed0394c9f87800343f6de233aa122dfe634b

Comment 82 caulier.gilles 2022-02-10 08:23:13 UTC

Git commit 812a06c094a39859f375e8fc3c065f1f0937f072 by Gilles Caulier.
Committed on 10/02/2022 at 08:20.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/album/treeview/abstractalbumtreeview.cpp
M  +1    -1    core/libs/filters/ratingfilter.cpp
M  +1    -1    core/libs/video/player/mediaplayerview.cpp
M  +1    -1    core/libs/video/player/slidevideo.cpp

https://invent.kde.org/graphics/digikam/commit/812a06c094a39859f375e8fc3c065f1f0937f072

Comment 83 caulier.gilles 2022-02-10 08:30:27 UTC

Git commit 5923b5c6d3b063fd9872c64f7f619919a1928d77 by Gilles Caulier.
Committed on 10/02/2022 at 08:27.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/libs/dplugins/widgets/dpreviewimage.h
M  +1    -1    core/utilities/import/widgets/freespacewidget.h

https://invent.kde.org/graphics/digikam/commit/5923b5c6d3b063fd9872c64f7f619919a1928d77

Comment 84 caulier.gilles 2022-02-10 08:46:41 UTC

Git commit 5bb639557bf21b43b7b65f2577bcfa3148aa1168 by Gilles Caulier.
Committed on 10/02/2022 at 08:44.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: update internal O2 library to last code from github with Qt6 support

M  +48   -0    core/libs/dplugins/webservices/o2/CMakeLists.txt
M  +12   -12   core/libs/dplugins/webservices/o2/LICENSE
M  +122  -87   core/libs/dplugins/webservices/o2/README.md
M  +4    -4    core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webenginepage.cpp
M  +3    -3    core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webenginepage.h
M  +9    -9    core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webwindow.cpp
M  +5    -5    core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webwindow.h
M  +1    -1    core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/msgraphdemo.cpp
M  +4    -4    core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webenginepage.cpp
M  +3    -3    core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webenginepage.h
M  +9    -9    core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webwindow.cpp
M  +5    -5    core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webwindow.h
M  +9    -1    core/libs/dplugins/webservices/o2/examples/sialis/README.md
M  +8    -7    core/libs/dplugins/webservices/o2/examples/sialis/main.qml
M  +1    -1    core/libs/dplugins/webservices/o2/examples/twitterdemo/tweeter.cpp
M  +2    -2    core/libs/dplugins/webservices/o2/o2_manifest.txt
M  +10   -4    core/libs/dplugins/webservices/o2/src/CMakeLists.txt
M  +15   -1    core/libs/dplugins/webservices/o2/src/o0baseauth.cpp
M  +12   -2    core/libs/dplugins/webservices/o2/src/o0baseauth.h
M  +14   -2    core/libs/dplugins/webservices/o2/src/o0export.h
M  +10   -0    core/libs/dplugins/webservices/o2/src/o0globals.h
M  +3    -3    core/libs/dplugins/webservices/o2/src/o0keychainstore.cpp
M  +1    -1    core/libs/dplugins/webservices/o2/src/o0keychainstore.h
M  +2    -0    core/libs/dplugins/webservices/o2/src/o0requestparameter.h
M  +11   -11   core/libs/dplugins/webservices/o2/src/o0simplecrypt.h
M  +37   -7    core/libs/dplugins/webservices/o2/src/o1.cpp
M  +1    -1    core/libs/dplugins/webservices/o2/src/o1.h
M  +0    -0    core/libs/dplugins/webservices/o2/src/o1freshbooks.h
M  +4    -0    core/libs/dplugins/webservices/o2/src/o1requestor.cpp
M  +2    -2    core/libs/dplugins/webservices/o2/src/o1smugmug.h
M  +3    -3    core/libs/dplugins/webservices/o2/src/o1twitter.h
M  +186  -47   core/libs/dplugins/webservices/o2/src/o2.cpp
M  +17   -2    core/libs/dplugins/webservices/o2/src/o2.h
M  +4    -0    core/libs/dplugins/webservices/o2/src/o2facebook.cpp
M  +4    -0    core/libs/dplugins/webservices/o2/src/o2reply.cpp
M  +1    -1    core/libs/dplugins/webservices/o2/src/o2reply.h
M  +1    -1    core/libs/dplugins/webservices/o2/src/o2replyserver.cpp
M  +54   -1    core/libs/dplugins/webservices/o2/src/o2requestor.cpp
M  +14   -4    core/libs/dplugins/webservices/o2/src/o2requestor.h
M  +12   -3    core/libs/dplugins/webservices/o2/src/o2simplecrypt.cpp
M  +5    -1    core/libs/dplugins/webservices/o2/src/o2skydrive.cpp
M  +4    -1    core/libs/dplugins/webservices/o2/src/o2uber.cpp
M  +8    -0    core/libs/dplugins/webservices/o2/src/oxtwitter.cpp

https://invent.kde.org/graphics/digikam/commit/5bb639557bf21b43b7b65f2577bcfa3148aa1168

Comment 85 caulier.gilles 2022-02-10 08:47:38 UTC

Git commit 41523f521d4660580e353cb4895cbcef3977135b by Gilles Caulier.
Committed on 10/02/2022 at 08:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: update internal O2 library to last code from github with Qt6 support

A  +4    -0    core/libs/dplugins/webservices/o2/.gitignore
A  +38   -0    core/libs/dplugins/webservices/o2/cmake/modules/FindQt5Keychain.cmake
A  +39   -0    core/libs/dplugins/webservices/o2/cmake/modules/FindQtKeychain.cmake
A  +6    -0    core/libs/dplugins/webservices/o2/examples/.gitignore
A  +73   -0    core/libs/dplugins/webservices/o2/examples/sialis/.gitignore
A  +13   -0    core/libs/dplugins/webservices/o2/examples/sialis/deployment.pri
A  +18   -0    core/libs/dplugins/webservices/o2/o2-config.h.cmake
A  +10   -0    core/libs/dplugins/webservices/o2/o2.pc.cmake
A  +51   -0    core/libs/dplugins/webservices/o2/o2.pro
A  +41   -0    core/libs/dplugins/webservices/o2/src/o0jsonresponse.cpp  *
A  +11   -0    core/libs/dplugins/webservices/o2/src/o0jsonresponse.h  *
A  +1    -0    core/libs/dplugins/webservices/o2/src/o2.pri
A  +15   -0    core/libs/dplugins/webservices/o2/src/o2googledevice.cpp  *
A  +16   -0    core/libs/dplugins/webservices/o2/src/o2googledevice.h  *
A  +14   -0    core/libs/dplugins/webservices/o2/src/o2outlook.cpp  *
A  +17   -0    core/libs/dplugins/webservices/o2/src/o2outlook.h  *
A  +117  -0    core/libs/dplugins/webservices/o2/src/o2pollserver.cpp  *
A  +49   -0    core/libs/dplugins/webservices/o2/src/o2pollserver.h  *
A  +96   -0    core/libs/dplugins/webservices/o2/src/src.pri

The files marked with a * at the end have a non valid license. Please read: https://community.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.


https://invent.kde.org/graphics/digikam/commit/41523f521d4660580e353cb4895cbcef3977135b

Comment 86 caulier.gilles 2022-02-10 09:03:14 UTC

Git commit 3c4540a8ebdfb30146678ca3909ebac7691d12ee by Gilles Caulier.
Committed on 10/02/2022 at 09:00.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -2    core/libs/album/engine/albumhistory.h

https://invent.kde.org/graphics/digikam/commit/3c4540a8ebdfb30146678ca3909ebac7691d12ee

Comment 87 caulier.gilles 2022-02-10 09:07:52 UTC

Git commit 4128407429d2b37096ca826a721c5001dd5f3f82 by Gilles Caulier.
Committed on 10/02/2022 at 09:05.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/tags/engine/tagmodificationhelper.h
M  +5    -0    core/libs/tags/manager/tagmngrtreeview.h
M  +5    -0    core/libs/tags/widgets/tagcheckview.h
M  +2    -0    core/libs/tags/widgets/tagfolderview.h

https://invent.kde.org/graphics/digikam/commit/4128407429d2b37096ca826a721c5001dd5f3f82

Comment 88 caulier.gilles 2022-02-10 09:11:46 UTC

Git commit 0744e7ff51b186164703f163fd56806268256dbd by Gilles Caulier.
Committed on 10/02/2022 at 09:09.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -1    core/libs/album/treeview/abstractalbumtreeview.cpp
M  +2    -1    core/libs/album/treeview/albumselectiontreeview.cpp

https://invent.kde.org/graphics/digikam/commit/0744e7ff51b186164703f163fd56806268256dbd

Comment 89 caulier.gilles 2022-02-10 09:24:30 UTC

Git commit 0091193fe723f0064d1ce72f1ab496d4a1605baf by Gilles Caulier.
Committed on 10/02/2022 at 09:24.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/album/engine/album.h
M  +0    -1    core/libs/album/engine/albumpointer.h

https://invent.kde.org/graphics/digikam/commit/0091193fe723f0064d1ce72f1ab496d4a1605baf

Comment 90 caulier.gilles 2022-02-10 09:35:11 UTC

Git commit dcfb426749402c168eccbb2858eca16b96c9e7f4 by Gilles Caulier.
Committed on 10/02/2022 at 09:32.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +3    -2    core/libs/tags/widgets/tagspopupmenu.cpp

https://invent.kde.org/graphics/digikam/commit/dcfb426749402c168eccbb2858eca16b96c9e7f4

Comment 91 caulier.gilles 2022-02-10 09:40:16 UTC

Git commit fea3bdf3d85aedb413daf665fd17fc5ff02ec717 by Gilles Caulier.
Committed on 10/02/2022 at 09:37.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +12   -6    core/libs/tags/widgets/tageditdlg.cpp

https://invent.kde.org/graphics/digikam/commit/fea3bdf3d85aedb413daf665fd17fc5ff02ec717

Comment 92 caulier.gilles 2022-02-10 09:46:42 UTC

Git commit d188607196e4c4917b8aa3d83e2e7a6e3cc6842c by Gilles Caulier.
Committed on 10/02/2022 at 09:44.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -1    core/dplugins/editor/transform/freerotation/freerotationtool.cpp
M  +6    -4    core/libs/tags/manager/tagpropwidget.cpp
M  +5    -4    core/libs/tags/manager/tagsmanager.cpp
M  +6    -2    core/utilities/advancedrename/advancedrenamewidget.cpp
M  +6    -2    core/utilities/imageeditor/editor/editortoolsettings.cpp
M  +6    -3    core/utilities/setup/metadata/namespaceeditdlg.cpp

https://invent.kde.org/graphics/digikam/commit/d188607196e4c4917b8aa3d83e2e7a6e3cc6842c

Comment 93 caulier.gilles 2022-02-10 09:48:10 UTC

Git commit d104647b478419c57a2529a1fd520e04e4013d97 by Gilles Caulier.
Committed on 10/02/2022 at 09:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/tags/manager/models/tagmngrlistmodel.cpp

https://invent.kde.org/graphics/digikam/commit/d104647b478419c57a2529a1fd520e04e4013d97

Comment 94 caulier.gilles 2022-02-10 10:05:49 UTC

Git commit e91a5d9f2bd4773c359f514b8f8ea48f970b3f84 by Gilles Caulier.
Committed on 10/02/2022 at 10:05.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/utilities/advancedrename/advancedrenamedialog.cpp

https://invent.kde.org/graphics/digikam/commit/e91a5d9f2bd4773c359f514b8f8ea48f970b3f84

Comment 95 caulier.gilles 2022-02-10 10:07:57 UTC

Git commit 5f499cf95fff084046c6f8c281c3a5f922cdb564 by Gilles Caulier.
Committed on 10/02/2022 at 10:05.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +7    -2    core/utilities/advancedrename/advancedrenamewidget.cpp

https://invent.kde.org/graphics/digikam/commit/5f499cf95fff084046c6f8c281c3a5f922cdb564

Comment 96 caulier.gilles 2022-02-10 10:11:15 UTC

Git commit b3f245f9f0629ef37ec688399c5cf2a7e7ca3e90 by Gilles Caulier.
Committed on 10/02/2022 at 10:08.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/advancedrename/common/parser.cpp

https://invent.kde.org/graphics/digikam/commit/b3f245f9f0629ef37ec688399c5cf2a7e7ca3e90

Comment 97 caulier.gilles 2022-02-10 10:16:31 UTC

Git commit d1f8d599632b0212344a80cdba8d8ec4c7f23411 by Gilles Caulier.
Committed on 10/02/2022 at 10:14.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/utilities/advancedrename/common/parser.cpp

https://invent.kde.org/graphics/digikam/commit/d1f8d599632b0212344a80cdba8d8ec4c7f23411

Comment 98 caulier.gilles 2022-02-10 10:46:07 UTC

Git commit 8322c1e3f3e394905ad868413acbf2bbc457a876 by Gilles Caulier.
Committed on 10/02/2022 at 10:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: migrate from KDE4 page wil only avaialble for Qt5 version not Qt6

M  +21   -1    core/utilities/firstrun/firstrundlg.cpp

https://invent.kde.org/graphics/digikam/commit/8322c1e3f3e394905ad868413acbf2bbc457a876

Comment 99 caulier.gilles 2022-02-10 10:47:45 UTC

Git commit 8e94b1cbf8574cae84cb4cbe6a1401e5f25d25f8 by Gilles Caulier.
Committed on 10/02/2022 at 10:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +9    -1    core/utilities/firstrun/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/8e94b1cbf8574cae84cb4cbe6a1401e5f25d25f8

Comment 100 caulier.gilles 2022-02-10 11:00:00 UTC

Git commit d85c4584a3030660e239b53924d0f0bef3a5a168 by Gilles Caulier.
Committed on 10/02/2022 at 10:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +0    -4    core/utilities/setup/setuputils.cpp
M  +4    -2    core/utilities/setup/setuputils.h

https://invent.kde.org/graphics/digikam/commit/d85c4584a3030660e239b53924d0f0bef3a5a168

Comment 101 caulier.gilles 2022-02-10 11:54:08 UTC

Git commit 88aaf05bcbe03bec47dd19052e4dc0eb4c3650bd by Gilles Caulier.
Committed on 10/02/2022 at 11:51.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +36   -6    core/utilities/setup/collections/dwitemdelegatepool.cpp

https://invent.kde.org/graphics/digikam/commit/88aaf05bcbe03bec47dd19052e4dc0eb4c3650bd

Comment 102 caulier.gilles 2022-02-10 12:01:00 UTC

Git commit bf2a0596a8d9148030131ea2c9289cfcdddc49cd by Gilles Caulier.
Committed on 10/02/2022 at 11:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -3    core/utilities/setup/collections/dwitemdelegatepool.cpp

https://invent.kde.org/graphics/digikam/commit/bf2a0596a8d9148030131ea2c9289cfcdddc49cd

Comment 103 caulier.gilles 2022-02-10 12:03:50 UTC

Git commit 8256ecba87e60326792a5ef0706c6b5123a1d77a by Gilles Caulier.
Committed on 10/02/2022 at 12:01.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -3    core/utilities/import/backend/dkcamera.h
M  +1    -0    core/utilities/setup/camera/setupcamera.h

https://invent.kde.org/graphics/digikam/commit/8256ecba87e60326792a5ef0706c6b5123a1d77a

Comment 104 caulier.gilles 2022-02-10 12:10:54 UTC

Git commit 3a466d5f28b1b22019939dcad9f735318408b33f by Gilles Caulier.
Committed on 10/02/2022 at 12:10.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/app/views/preview/itempreviewview.cpp
M  +1    -1    core/app/views/preview/itempreviewview.h

https://invent.kde.org/graphics/digikam/commit/3a466d5f28b1b22019939dcad9f735318408b33f

Comment 105 caulier.gilles 2022-02-10 12:19:59 UTC

Git commit 0d85a90fca264a2c82774a661acb9eafeed7ab55 by Gilles Caulier.
Committed on 10/02/2022 at 12:17.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -0    core/app/views/preview/itempreviewview.cpp
M  +7    -1    core/app/views/preview/itempreviewview.h
M  +5    -1    core/libs/dplugins/widgets/dpreviewimage.cpp
M  +6    -1    core/libs/dplugins/widgets/dpreviewimage.h
M  +4    -0    core/utilities/import/views/importpreviewview.cpp
M  +6    -1    core/utilities/import/views/importpreviewview.h
M  +4    -0    core/utilities/import/widgets/freespacewidget.cpp
M  +6    -1    core/utilities/import/widgets/freespacewidget.h

https://invent.kde.org/graphics/digikam/commit/0d85a90fca264a2c82774a661acb9eafeed7ab55

Comment 106 caulier.gilles 2022-02-10 12:23:44 UTC

Git commit 1d23a64468599cfbcc8cb47ce6e5f17ecdf7f281 by Gilles Caulier.
Committed on 10/02/2022 at 12:21.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++: fix keyboard modifier separator from + to |

M  +1    -1    core/app/items/utils/contextmenuhelper_tags.cpp
M  +1    -1    core/app/main/digikamapp_camera.cpp
M  +34   -34   core/app/main/digikamapp_setup.cpp
M  +1    -1    core/app/views/sidebar/albumfolderviewsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/datefolderviewsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/fuzzysearchsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/gpssearchsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/labelssidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/peoplesidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/searchsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/tagviewsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/timelinesidebarwidget.cpp
M  +1    -1    core/dplugins/editor/colors/adjustcurves/adjustcurvestoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/adjustlevels/adjustlevelstoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/autocorrection/autocorrectiontoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/channelmixer/channelmixertoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/colorbalance/cbtoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/film/filmtoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/hsl/hsltoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/invert/inverttoolplugin.cpp
M  +1    -1    core/dplugins/editor/colors/whitebalance/whitebalancetoolplugin.cpp
M  +1    -1    core/dplugins/editor/decorate/inserttext/inserttexttoolplugin.cpp
M  +1    -1    core/dplugins/editor/file/print/printplugin.cpp
M  +1    -1    core/dplugins/editor/transform/autocrop/autocroptoolplugin.cpp
M  +3    -3    core/dplugins/editor/transform/freerotation/freerotationtoolplugin.cpp
M  +1    -1    core/dplugins/generic/metadata/geolocationedit/geolocationeditplugin.cpp
M  +1    -1    core/dplugins/generic/metadata/metadataedit/metadataeditplugin.cpp
M  +1    -1    core/dplugins/generic/metadata/timeadjust/timeadjustplugin.cpp
M  +1    -1    core/dplugins/generic/tools/htmlgallery/htmlgalleryplugin.cpp
M  +1    -1    core/dplugins/generic/view/presentation/presentationplugin.cpp
M  +2    -2    core/dplugins/generic/view/slideshow/slideshowplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/box/boxplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/dropbox/dbplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/facebook/fbplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/filecopy/fcplugin.cpp
M  +2    -2    core/dplugins/generic/webservices/filetransfer/ftplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/flickr/flickrplugin.cpp
M  +3    -3    core/dplugins/generic/webservices/google/gsplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/imageshack/imageshackplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/inaturalist/inatplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/onedrive/odplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/pinterest/pplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/rajce/rajceplugin.cpp
M  +2    -2    core/dplugins/generic/webservices/smugmug/smugplugin.cpp
M  +1    -1    core/dplugins/generic/webservices/yandexfotki/yfplugin.cpp
M  +1    -1    core/showfoto/main/showfoto_setup.cpp
M  +19   -19   core/utilities/imageeditor/editor/editorwindow.cpp
M  +4    -4    core/utilities/imageeditor/main/imagewindow_setup.cpp
M  +14   -14   core/utilities/import/main/importui.cpp
M  +23   -23   core/utilities/lighttable/lighttablewindow_setup.cpp
M  +5    -5    core/utilities/queuemanager/main/queuemgrwindow.cpp

https://invent.kde.org/graphics/digikam/commit/1d23a64468599cfbcc8cb47ce6e5f17ecdf7f281

Comment 107 caulier.gilles 2022-02-10 12:26:40 UTC

Git commit 951fb0380312919a869efe789488fb216854de1e by Gilles Caulier.
Committed on 10/02/2022 at 12:24.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/utilities/lighttable/lighttablewindow_setup.cpp

https://invent.kde.org/graphics/digikam/commit/951fb0380312919a869efe789488fb216854de1e

Comment 108 caulier.gilles 2022-02-10 12:27:28 UTC

Git commit c2e98fd57388960bc0eb96577899afc4ab3ce9f3 by Gilles Caulier.
Committed on 10/02/2022 at 12:25.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/utilities/lighttable/lighttablewindow_setup.cpp

https://invent.kde.org/graphics/digikam/commit/c2e98fd57388960bc0eb96577899afc4ab3ce9f3

Comment 109 caulier.gilles 2022-02-10 12:30:35 UTC

Git commit 203918465cc145c3949e16d14438221a344759fb by Gilles Caulier.
Committed on 10/02/2022 at 12:28.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/lighttable/lighttablewindow_setup.cpp

https://invent.kde.org/graphics/digikam/commit/203918465cc145c3949e16d14438221a344759fb

Comment 110 caulier.gilles 2022-02-10 12:51:15 UTC

Git commit 8774ef3088636b5e51bf5c6d40d1a09daef28a9a by Gilles Caulier.
Committed on 10/02/2022 at 12:48.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -3    core/utilities/lighttable/lighttablewindow_setup.cpp

https://invent.kde.org/graphics/digikam/commit/8774ef3088636b5e51bf5c6d40d1a09daef28a9a

Comment 111 caulier.gilles 2022-02-10 12:56:46 UTC

Git commit fdc7c0fa8c795d3a02313a646ec759f5d2703f7c by Gilles Caulier.
Committed on 10/02/2022 at 12:56.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/utilities/fuzzysearch/findduplicatesalbum.h
M  +1    -2    core/utilities/fuzzysearch/findduplicatesalbumitem.h
M  +5    -4    core/utilities/fuzzysearch/findduplicatesview.h
M  +2    -4    core/utilities/fuzzysearch/fuzzysearchview.h

https://invent.kde.org/graphics/digikam/commit/fdc7c0fa8c795d3a02313a646ec759f5d2703f7c

Comment 112 caulier.gilles 2022-02-10 13:06:13 UTC

Git commit 332aba42c3c2fcc35def0bf3ca8d7d8b08446e50 by Gilles Caulier.
Committed on 10/02/2022 at 13:06.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -5    core/utilities/maintenance/databasetask.h
M  +2    -5    core/utilities/maintenance/dbcleaner.h
M  +2    -2    core/utilities/maintenance/facesdetector.h
M  +1    -1    core/utilities/maintenance/fingerprintsgenerator.h
M  +2    -2    core/utilities/maintenance/iteminfojob.h
M  +5    -1    core/utilities/maintenance/maintenancedata.h
M  +0    -1    core/utilities/maintenance/maintenancesettings.cpp
M  +5    -1    core/utilities/maintenance/maintenancethread.h
M  +1    -3    core/utilities/maintenance/metadatasynchronizer.h
M  +1    -0    core/utilities/maintenance/newitemsfinder.h

https://invent.kde.org/graphics/digikam/commit/332aba42c3c2fcc35def0bf3ca8d7d8b08446e50

Comment 113 caulier.gilles 2022-02-10 13:36:39 UTC

Git commit c931489cc0e4dbcd059e6b2012543423f9e433a2 by Gilles Caulier.
Committed on 10/02/2022 at 13:34.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -1    core/showfoto/folderview/showfotofolderviewbookmarklist.cpp
M  +6    -1    core/showfoto/folderview/showfotofolderviewbookmarklist.h
M  +5    -1    core/showfoto/stackview/showfotostackviewfavoritelist.cpp
M  +6    -1    core/showfoto/stackview/showfotostackviewfavoritelist.h
M  +5    -1    core/tests/geolocation/geoiface/demo/mytreewidget.cpp
M  +8    -4    core/tests/geolocation/geoiface/demo/mytreewidget.h
M  +4    -0    core/utilities/queuemanager/views/assignedlist.cpp
M  +11   -7    core/utilities/queuemanager/views/assignedlist.h
M  +5    -1    core/utilities/queuemanager/views/queuelist.cpp
M  +5    -1    core/utilities/queuemanager/views/queuelist.h
M  +5    -1    core/utilities/queuemanager/views/toolslistview.cpp
M  +5    -1    core/utilities/queuemanager/views/toolslistview.h
M  +5    -1    core/utilities/queuemanager/views/workflowlist.cpp
M  +5    -1    core/utilities/queuemanager/views/workflowlist.h

https://invent.kde.org/graphics/digikam/commit/c931489cc0e4dbcd059e6b2012543423f9e433a2

Comment 114 caulier.gilles 2022-02-10 13:39:14 UTC

Git commit 8dd9f0f5a1a739c0708ad90fc2f7dd56f8efc584 by Gilles Caulier.
Committed on 10/02/2022 at 13:39.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/queuemanager/views/assignedlist.cpp

https://invent.kde.org/graphics/digikam/commit/8dd9f0f5a1a739c0708ad90fc2f7dd56f8efc584

Comment 115 caulier.gilles 2022-02-10 13:49:46 UTC

Git commit fe31ab33d04433bad5859fa664f0a25a1042ccb9 by Gilles Caulier.
Committed on 10/02/2022 at 13:47.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -1    core/utilities/imageeditor/widgets/imageguidewidget.cpp
M  +7    -1    core/utilities/imageeditor/widgets/imageguidewidget.h

https://invent.kde.org/graphics/digikam/commit/fe31ab33d04433bad5859fa664f0a25a1042ccb9

Comment 116 caulier.gilles 2022-02-10 13:54:46 UTC

Git commit 2f273268c4fe909dd29a5abf66705a24b1482a95 by Gilles Caulier.
Committed on 10/02/2022 at 13:52.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -5    core/utilities/imageeditor/editor/editorwindow.cpp

https://invent.kde.org/graphics/digikam/commit/2f273268c4fe909dd29a5abf66705a24b1482a95

Comment 117 caulier.gilles 2022-02-10 13:57:29 UTC

Git commit 8907f3562c02382588f8dd30a35cf820f2d9350b by Gilles Caulier.
Committed on 10/02/2022 at 13:55.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +5    -5    core/utilities/imageeditor/editor/editorwindow.cpp

https://invent.kde.org/graphics/digikam/commit/8907f3562c02382588f8dd30a35cf820f2d9350b

Comment 118 caulier.gilles 2022-02-10 13:59:57 UTC

Git commit b18ab4e7fc70f056c8713d003abaabab82138edd by Gilles Caulier.
Committed on 10/02/2022 at 13:57.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/utilities/imageeditor/widgets/previewtoolbar.cpp

https://invent.kde.org/graphics/digikam/commit/b18ab4e7fc70f056c8713d003abaabab82138edd

Comment 119 caulier.gilles 2022-02-10 14:01:32 UTC

Git commit 7d75638b1309705f2bf3a29f2ee040b3f1099d92 by Gilles Caulier.
Committed on 10/02/2022 at 13:59.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -2    core/utilities/imageeditor/widgets/previewtoolbar.h

https://invent.kde.org/graphics/digikam/commit/7d75638b1309705f2bf3a29f2ee040b3f1099d92

Comment 120 caulier.gilles 2022-02-10 14:04:29 UTC

Git commit b995afc3ba73052611bbf9d347360a1270c828a6 by Gilles Caulier.
Committed on 10/02/2022 at 14:02.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/imageeditor/main/imagewindow.cpp
M  +2    -0    core/utilities/imageeditor/widgets/imageguidewidget.cpp

https://invent.kde.org/graphics/digikam/commit/b995afc3ba73052611bbf9d347360a1270c828a6

Comment 121 caulier.gilles 2022-02-10 14:12:57 UTC

Git commit ed194c3fda11d5fcb0c9b0af13cf6cf1fd7b7d0e by Gilles Caulier.
Committed on 10/02/2022 at 14:10.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +13   -2    core/utilities/import/widgets/importcontextmenu.cpp

https://invent.kde.org/graphics/digikam/commit/ed194c3fda11d5fcb0c9b0af13cf6cf1fd7b7d0e

Comment 122 caulier.gilles 2022-02-10 14:20:13 UTC

Git commit f59fb2523e9a891cc74ed8b1e4d0543acfb096e7 by Gilles Caulier.
Committed on 10/02/2022 at 14:20.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/import/main/importui.cpp
M  +2    -0    core/utilities/import/main/importui_p.h

https://invent.kde.org/graphics/digikam/commit/f59fb2523e9a891cc74ed8b1e4d0543acfb096e7

Comment 123 caulier.gilles 2022-02-10 14:23:21 UTC

Git commit 3ef29c9af134920c6eb0222a2404aed1174b624b by Gilles Caulier.
Committed on 10/02/2022 at 14:21.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/utilities/import/main/importui.cpp

https://invent.kde.org/graphics/digikam/commit/3ef29c9af134920c6eb0222a2404aed1174b624b

Comment 124 caulier.gilles 2022-02-10 14:26:54 UTC

Git commit 37fc7f473b7fc19838454e777ef597d718aace04 by Gilles Caulier.
Committed on 10/02/2022 at 14:24.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -1    core/utilities/import/main/importui.cpp

https://invent.kde.org/graphics/digikam/commit/37fc7f473b7fc19838454e777ef597d718aace04

Comment 125 caulier.gilles 2022-02-10 16:00:17 UTC

Git commit 8a29e4e0418e68118485cec7d092096c6ee36c50 by Gilles Caulier.
Committed on 10/02/2022 at 15:57.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/dplugins/webservices/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/8a29e4e0418e68118485cec7d092096c6ee36c50

Comment 126 caulier.gilles 2022-02-10 16:10:04 UTC

Git commit 13dcf417470f0a5920d29b973ecdd0cd85a19f04 by Gilles Caulier.
Committed on 10/02/2022 at 16:09.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Now libdigikam core based on Qt6 compile and link:
...
[ 52%] Built target gui_searchwindow_obj
[ 52%] Automatic MOC for target gui_facemanagement_obj
[ 52%] Built target gui_facemanagement_obj_autogen
[ 53%] Built target gui_facemanagement_obj
[ 53%] Automatic MOC for target gui_focuspointmanagement_obj
[ 53%] Built target gui_focuspointmanagement_obj_autogen
[ 53%] Built target gui_focuspointmanagement_obj
[ 53%] Automatic MOC for target digikamcore
[ 53%] Built target digikamcore_autogen
Consolidate compiler generated dependencies of target digikamcore
[ 53%] Building CXX object core/app/CMakeFiles/digikamcore.dir/utils/digikam_version.cpp.o
[ 53%] Linking CXX shared library libdigikamcore.so
[ 53%] Built target digikamcore
[ 53%] Automatic MOC for target digikamdatabase
[ 53%] Built target digikamdatabase_autogen
...

M  +2    -1    core/libs/dplugins/webservices/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/13dcf417470f0a5920d29b973ecdd0cd85a19f04

Comment 127 caulier.gilles 2022-02-10 16:29:24 UTC

Git commit 682bec7428657f659f36f01353339228f952fb40 by Gilles Caulier.
Committed on 10/02/2022 at 16:29.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/libs/database/item/lister/itemlisterrecord.h

https://invent.kde.org/graphics/digikam/commit/682bec7428657f659f36f01353339228f952fb40

Comment 128 caulier.gilles 2022-02-10 16:52:56 UTC

Git commit e9dd2ca95b6b52330f8583d2e17d976900f04141 by Gilles Caulier.
Committed on 10/02/2022 at 16:51.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Now digikamdatabase Qt6 based link properly:
...
[ 53%] Built target digikamcore_autogen
Consolidate compiler generated dependencies of target digikamcore
[ 53%] Building CXX object core/app/CMakeFiles/digikamcore.dir/utils/digikam_version.cpp.o
[ 53%] Linking CXX shared library libdigikamcore.so
[ 53%] Built target digikamcore
[ 53%] Automatic MOC for target digikamdatabase
[ 53%] Built target digikamdatabase_autogen
[ 53%] Linking CXX shared library libdigikamdatabase.so
[ 53%] Built target digikamdatabase
[ 53%] Automatic MOC for target gui_digikam_obj
[ 53%] Built target gui_digikam_obj_autogen
Consolidate compiler generated dependencies of target gui_digikam_obj
[ 53%] Building CXX object core/app/CMakeFiles/gui_digikam_obj.dir/main/digikamapp_solid.cpp.o
...

M  +2    -2    core/libs/database/item/lister/itemlisterrecord.h

https://invent.kde.org/graphics/digikam/commit/e9dd2ca95b6b52330f8583d2e17d976900f04141

Comment 129 caulier.gilles 2022-02-10 16:54:58 UTC

Git commit 3fd3b8c571fd6d848f8efb9110b0470f45b010d6 by Gilles Caulier.
Committed on 10/02/2022 at 16:52.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/app/main/digikamapp_p.h

https://invent.kde.org/graphics/digikam/commit/3fd3b8c571fd6d848f8efb9110b0470f45b010d6

Comment 130 caulier.gilles 2022-02-10 16:59:54 UTC

Git commit 2e2e6bc610405192f450f469d3382803bf2c76a0 by Gilles Caulier.
Committed on 10/02/2022 at 16:57.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +4    -4    core/app/main/digikamapp_setup.cpp

https://invent.kde.org/graphics/digikam/commit/2e2e6bc610405192f450f469d3382803bf2c76a0

Comment 131 caulier.gilles 2022-02-10 17:03:04 UTC

Git commit dc8b03097580138e1bba7a3eacb96b01d54d4555 by Gilles Caulier.
Committed on 10/02/2022 at 17:00.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +8    -4    core/app/date/ddatepicker.cpp

https://invent.kde.org/graphics/digikam/commit/dc8b03097580138e1bba7a3eacb96b01d54d4555

Comment 132 caulier.gilles 2022-02-10 17:04:55 UTC

Git commit 6b068684878666e4580a87d3869216da049bf862 by Gilles Caulier.
Committed on 10/02/2022 at 17:02.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/app/dragdrop/ddragobjects.cpp

https://invent.kde.org/graphics/digikam/commit/6b068684878666e4580a87d3869216da049bf862

Comment 133 caulier.gilles 2022-02-10 17:06:19 UTC

Git commit ffe65e381e8e1c1851146492a6b6b3b569f11dab by Gilles Caulier.
Committed on 10/02/2022 at 17:03.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -0    core/app/filters/filtersidebarwidget.cpp

https://invent.kde.org/graphics/digikam/commit/ffe65e381e8e1c1851146492a6b6b3b569f11dab

Comment 134 caulier.gilles 2022-02-10 17:13:45 UTC

Git commit a7d86e77f4755f6a2cb58114fd325362972a891b by Gilles Caulier.
Committed on 10/02/2022 at 17:11.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +13   -10   core/app/items/utils/itemviewutilities.cpp

https://invent.kde.org/graphics/digikam/commit/a7d86e77f4755f6a2cb58114fd325362972a891b

Comment 135 caulier.gilles 2022-02-10 17:39:57 UTC

Git commit 91c5eeb942132e2ae0a6aef980f8658b48cbb24a by Gilles Caulier.
Committed on 10/02/2022 at 17:39.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/app/views/sidebar/albumfolderviewsidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/datefolderviewsidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/fuzzysearchsidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/gpssearchsidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/labelssidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/peoplesidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/searchsidebarwidget.cpp
M  +1    -1    core/app/views/sidebar/sidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/tagviewsidebarwidget.cpp
M  +2    -2    core/app/views/sidebar/timelinesidebarwidget.cpp

https://invent.kde.org/graphics/digikam/commit/91c5eeb942132e2ae0a6aef980f8658b48cbb24a

Comment 136 caulier.gilles 2022-02-10 18:09:22 UTC

Et voila. digiKam binary Qt6 based compile and link now :

/home/gilles/Documents/7.x/core/app/main/main.cpp:112:44: warning: ‘Qt::AA_DisableHighDpiScaling’ is deprecated: High-DPI scaling is always enabled. This attribute no longer has any effect. [-Wdeprecated-declarations]
  112 |         QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /usr/include/QtCore/qbytearray.h:45,
                 from /usr/include/QtCore/qstringview.h:58,
                 from /usr/include/QtCore/qchar.h:666,
                 from /usr/include/QtCore/qstring.h:50,
                 from /usr/include/QtCore/qdir.h:43,
                 from /usr/include/QtCore/QDir:1,
                 from /home/gilles/Documents/7.x/core/app/main/main.cpp:29:
/usr/include/QtCore/qnamespace.h:476:9: note: declared here
  476 |         AA_DisableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED_X(
      |         ^~~~~~~~~~~~~~~~~~~~~~~~
[100%] Linking CXX executable digikam
[100%] Built target digikam

[root@localhost app]# 

It still all dplugins and showfoto to complete the job...

Gilles

Comment 137 Maik Qualmann 2022-02-10 18:26:00 UTC

Wow, what an extensive and great work. ((:-))

Best

Maik

Comment 138 caulier.gilles 2022-02-10 18:26:57 UTC

Git commit 925c2761c706182860630aecc00797a639e4c134 by Gilles Caulier.
Committed on 10/02/2022 at 18:25.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Now Showfoto Qt6 based is here :

[ 94%] Automatic MOC for target showfoto
[ 94%] Built target showfoto_autogen
Consolidate compiler generated dependencies of target showfoto
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/stackview/showfotostackviewfavorites.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/stackview/showfotostackviewfavoriteitem.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfotosettings.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfotoinfoiface.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_open.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_iofiles.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_setup.cpp.o
[ 94%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_config.cpp.o
[ 97%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_import.cpp.o
[ 97%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/showfoto_thumbbar.cpp.o
[ 97%] Building CXX object core/showfoto/CMakeFiles/showfoto.dir/main/main.cpp.o
[ 97%] Linking CXX executable showfoto
[100%] Built target showfoto
[root@localhost showfoto]#

M  +1    -1    core/showfoto/folderview/showfotofolderviewbookmarkdlg.cpp
M  +6    -0    core/showfoto/stackview/showfotostackviewfavorites.cpp
M  +1    -0    core/showfoto/stackview/showfotostackviewlist.cpp

https://invent.kde.org/graphics/digikam/commit/925c2761c706182860630aecc00797a639e4c134

Comment 139 caulier.gilles 2022-02-10 18:28:53 UTC

Maik,
Please double check my patches from Comment 61 and 62...
Gilles

Comment 140 Maik Qualmann 2022-02-10 18:38:25 UTC

It actually looks correct to me, we'll test it. Is this compiled Qt6 digiKam version ready to run?

Maik

Comment 141 caulier.gilles 2022-02-10 18:41:15 UTC

Showfoto starts: https://i.imgur.com/zXYJOla.png

digiKam crash after first run, due to application data files not properly installed on the system.
Plenty of stuff are broken. The real port will start after to complete all plugins and the test collection codes.

Gilles

Comment 142 caulier.gilles 2022-02-10 20:33:39 UTC

Git commit 8f402337969833ecb4a43802d3c55b8bf5901779 by Gilles Caulier.
Committed on 10/02/2022 at 20:32.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

All BQM and DImg plugins compile fine

M  +1    -1    core/dplugins/bqm/convert/converttodng/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttoheif/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttojp2/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttojpeg/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttopgf/CMakeLists.txt
M  +1    -1    core/dplugins/bqm/convert/converttopng/CMakeLists.txt
M  +2    -2    core/dplugins/bqm/convert/converttotiff/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/8f402337969833ecb4a43802d3c55b8bf5901779

Comment 143 caulier.gilles 2022-02-10 20:44:23 UTC

Git commit 82977b863c072db1235446e47f62737b6ef261d0 by Gilles Caulier.
Committed on 10/02/2022 at 20:43.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

All Image eDitor plugins compile fine now

M  +4    -4    core/dplugins/editor/transform/freerotation/freerotationtool.cpp

https://invent.kde.org/graphics/digikam/commit/82977b863c072db1235446e47f62737b6ef261d0

Comment 144 caulier.gilles 2022-02-10 20:46:41 UTC

Git commit 7975f583e632af5214462dbd3d5e16b67e193d91 by Gilles Caulier.
Committed on 10/02/2022 at 20:46.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

All RawImport plugins compile fine now

M  +1    -1    core/dplugins/rawimport/darktable/CMakeLists.txt
M  +1    -1    core/dplugins/rawimport/native/CMakeLists.txt
M  +1    -1    core/dplugins/rawimport/rawtherapee/CMakeLists.txt
M  +1    -1    core/dplugins/rawimport/ufraw/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/7975f583e632af5214462dbd3d5e16b67e193d91

Comment 145 caulier.gilles 2022-02-10 21:12:23 UTC

Git commit 6e810fff68a976b0dd3abc7fdd1033cb7ee0a358 by Gilles Caulier.
Committed on 10/02/2022 at 21:12.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/dplugins/generic/tools/calendar/wizard/calwidget.cpp
M  +1    -1    core/dplugins/generic/tools/dngconverter/dngconvertertask.cpp
M  +7    -1    core/dplugins/generic/tools/htmlgallery/generator/gallerytheme.cpp
M  +1    -1    core/dplugins/generic/tools/htmlgallery/wizard/htmlimagesettingspage.cpp

https://invent.kde.org/graphics/digikam/commit/6e810fff68a976b0dd3abc7fdd1033cb7ee0a358

Comment 146 caulier.gilles 2022-02-11 06:34:42 UTC

Git commit 2931793921419694fdab6aea7b17e26c0fe1c8da by Gilles Caulier.
Committed on 11/02/2022 at 06:34.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +20   -3    core/CMakeLists.txt
M  +1    -1    core/dplugins/generic/tools/jalbum/CMakeLists.txt
M  +1    -0    core/dplugins/generic/tools/mediaserver/CMakeLists.txt
M  +5    -2    core/dplugins/generic/tools/mediaserver/server/dmediaservermngr.cpp
M  +7    -4    core/dplugins/generic/tools/mjpegstream/mjpegserver_p.cpp
M  +6    -3    core/dplugins/generic/tools/mjpegstream/mjpegservermngr.cpp
M  +4    -0    core/dplugins/generic/tools/panorama/wizard/panopreviewpage.cpp
M  +7    -2    core/dplugins/generic/tools/panorama/wizard/panopreviewpage.h
M  +5    -1    core/dplugins/generic/view/glviewer/CMakeLists.txt
M  +8    -1    core/dplugins/generic/view/presentation/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/2931793921419694fdab6aea7b17e26c0fe1c8da

Comment 147 caulier.gilles 2022-02-11 07:04:32 UTC

Git commit 55cdf0399ed6bf12e4f2aad19725824143b0a429 by Gilles Caulier.
Committed on 11/02/2022 at 07:04.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +2    -2    core/dplugins/generic/webservices/smugmug/smugwindow.cpp

https://invent.kde.org/graphics/digikam/commit/55cdf0399ed6bf12e4f2aad19725824143b0a429

Comment 148 caulier.gilles 2022-02-11 07:06:25 UTC

It still 3 plugins which d o not compile yet :

- expoblending (QtConcurrent::run problems with volatile args)
- flickr (O2 API port required)
- twitter  (O2 API port required)

Gilles

Comment 149 caulier.gilles 2022-02-11 07:07:16 UTC

Git commit 273229de47a4724ae51ce3c2268ac96c1b637b4b by Gilles Caulier.
Committed on 11/02/2022 at 07:07.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +1    -1    core/dplugins/generic/webservices/inaturalist/inatwindow.cpp
M  +2    -2    core/dplugins/generic/webservices/mediawiki/mediawikiwidget.cpp
M  +4    -2    core/dplugins/generic/webservices/piwigo/piwigologindlg.h
M  +1    -2    core/dplugins/generic/webservices/piwigo/piwigotalker.h
M  +1    -2    core/dplugins/generic/webservices/piwigo/piwigowindow.h

https://invent.kde.org/graphics/digikam/commit/273229de47a4724ae51ce3c2268ac96c1b637b4b

Comment 150 caulier.gilles 2022-02-11 09:13:11 UTC

Git commit dac36cd1a9fe3040120c2e4b1a64983acc2d0fbd by Gilles Caulier.
Committed on 11/02/2022 at 09:11.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Install KF6::filemetadata and check if Baloo wrap code compile under Qt6

M  +1    -1    bootstrap.qt6
M  +5    -1    project/bundles/3rdparty/ext_kf6_frameworks/CMakeLists.txt
R  +10   -10   project/bundles/3rdparty/ext_kf6_frameworks/kdesrc-buildrc.cmake.in [from: project/bundles/3rdparty/ext_kf6_frameworks/kdesrc-buildrc - 074% similarity]
M  +1    -0    project/bundles/appimage/01-build-host.sh
M  +1    -0    project/bundles/appimage/02-build-extralibs.sh

https://invent.kde.org/graphics/digikam/commit/dac36cd1a9fe3040120c2e4b1a64983acc2d0fbd

Comment 151 caulier.gilles 2022-02-11 09:37:43 UTC

Maik,

Important remarks :

- Qt6::QMultimap do not inerit from QMap anymore. This want mean that we need QMultimap and all iterator ported where it's need. API has also changed or moved in QMap in favor of QMultimap. Here of course regression tests will necessary to see if nothing is broken.

- There are plenty of warnings now in the console while compiling, and few are really informative. This concern also Qt5 code (that we have ignored until now). Typically, fixing Qt6 port warnings must be reported to Qt5.

- One most important point is the code to merge in master : Where and when ? I recommend to not do it faster, as i'm sure this port as introduced plenty of bug, but... I would like to see summer student working with this branch (Qt6 and Qt5 compatible).

- I don't yet check if this code still compile with Qt5. I'm sure that minimal version of Qt5 is now 5.14.0 at least, but...

- I suggest to release digiKam 7.6.0 with current master branch (in few days/weeks) and later merge back Qt6 port to master.

- Qt6 port must be released as 8.0.0 ?

Gilles

Comment 152 caulier.gilles 2022-02-11 09:40:40 UTC

Git commit a9a17fbd60a0c8317ac9ca1cf8d91477032c97af by Gilles Caulier.
Committed on 11/02/2022 at 09:40.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +7    -6    core/dplugins/generic/webservices/flickr/flickrtalker.cpp

https://invent.kde.org/graphics/digikam/commit/a9a17fbd60a0c8317ac9ca1cf8d91477032c97af

Comment 153 caulier.gilles 2022-02-11 09:45:16 UTC

Git commit 88c092d71cb2a22e956d91cab2eee3bf3c84c013 by Gilles Caulier.
Committed on 11/02/2022 at 09:45.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +10   -1    core/dplugins/generic/webservices/twitter/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/88c092d71cb2a22e956d91cab2eee3bf3c84c013

Comment 154 caulier.gilles 2022-02-11 09:59:22 UTC

Git commit 330ca49c5adad22fb2b0a4b4b1aca069742ac6a3 by Gilles Caulier.
Committed on 11/02/2022 at 09:58.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

\+/ DONE
All plugins now compile fine with Qt6
As we said in France : Champagne to all!!!

[ 84%] Built target core_setupcommon_obj
[ 84%] Automatic MOC for target core_dmetadata_obj
[ 87%] Built target core_imageeditor_obj
[ 87%] Built target core_dmetadata_obj_autogen
[ 96%] Built target core_dmetadata_obj
Consolidate compiler generated dependencies of target digikamcore
[ 96%] Building CXX object core/app/CMakeFiles/digikamcore.dir/utils/digikam_version.cpp.o
[ 96%] Linking CXX shared library libdigikamcore.so
[ 96%] Built target digikamcore
[ 96%] Automatic MOC for target Generic_ExpoBlending_Plugin
[ 96%] Built target Generic_ExpoBlending_Plugin_autogen
Consolidate compiler generated dependencies of target Generic_ExpoBlending_Plugin
[ 96%] Building CXX object core/dplugins/generic/tools/expoblending/CMakeFiles/Generic_ExpoBlending_Plugin.dir/manager/expoblendingthread.cpp.o
[ 96%] Linking CXX shared module Generic_ExpoBlending_Plugin.so
[100%] Built target Generic_ExpoBlending_Plugin

M  +17   -13   core/dplugins/generic/tools/expoblending/manager/expoblendingthread.cpp
M  +1    -1    core/dplugins/generic/tools/expoblending/manager/expoblendingthread.h

https://invent.kde.org/graphics/digikam/commit/330ca49c5adad22fb2b0a4b4b1aca069742ac6a3

Comment 155 caulier.gilles 2022-02-11 10:15:44 UTC

Git commit 26b09df3f3cde4415acee1644ca332c4352ac103 by Gilles Caulier.
Committed on 11/02/2022 at 10:15.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++ : enable unit-test compilations

M  +2    -2    bootstrap.qt6
M  +1    -1    core/tests/facesengine/demo/CMakeLists.txt
M  +3    -3    core/tests/fileio/CMakeLists.txt
M  +6    -2    core/tests/imgqsort/CMakeLists.txt
M  +6    -1    core/tests/metadataengine/CMakeLists.txt
M  +3    -3    core/tests/metadataengine/focuspoint/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/26b09df3f3cde4415acee1644ca332c4352ac103

Comment 156 caulier.gilles 2022-02-11 14:41:04 UTC

Git commit e3f50883ed43b66a365d507ea4276f961fbe74fe by Gilles Caulier.
Committed on 11/02/2022 at 14:39.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port : All Unit-tests compile now.
...
[100%] Automatic MOC for target IOJobsTest
[100%] Built target facesenginedemo_gui_autogen
[100%] Built target convert_format_cli_autogen
[100%] Built target renamecustomizer_utest
[100%] Built target IOJobsTest_autogen
[100%] Built target cameranamehelper_utest
[100%] Built target albummodel_utest
[100%] Built target advancedrename_utest
[100%] Built target checkdatabaseswitch_cli
[100%] Built target checkdatabaseinit_cli
[100%] Built target databasefields_utest
[100%] Built target databasetags_utest
[100%] Built target align_gui
[100%] Built target preprocess_gui
Consolidate compiler generated dependencies of target face_rec_cli
[100%] Built target detect_gui
[100%] Built target benchmark_dnndetection_gui
[100%] Built target recognize_cli
[100%] Building CXX object core/tests/facesengine/recognition/CMakeFiles/face_rec_cli.dir/face_rec_cli.cpp.o
[100%] Built target benchmark_recognition_cli
[100%] Built target recognition_gui
[100%] Built target traindb_cli
[100%] Built target facesenginedemo_gui
[100%] Built target IOJobsTest
[100%] Built target convert_format_cli
[100%] Linking CXX executable face_rec_cli
[100%] Built target face_rec_cli
...
TODO : check if libksane based code and Marble based code compile with Qt6. Both still unavailable for the moment.

M  +3    -3    core/tests/facesengine/recognition/face_rec_cli.cpp
M  +11   -4    core/tests/metadataengine/exiftool/exiftoolmulticore_cli.cpp

https://invent.kde.org/graphics/digikam/commit/e3f50883ed43b66a365d507ea4276f961fbe74fe

Comment 157 caulier.gilles 2022-02-11 22:35:18 UTC

Git commit 5809dc3d9e22ca0d3b9614e4f72c19d0df72ef40 by Gilles Caulier.
Committed on 11/02/2022 at 22:33.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Hack to setup install variable not set with KF6

M  +18   -7    core/CMakeLists.txt
M  +0    -1    project/bundles/3rdparty/ext_kf6_frameworks/CMakeLists.txt
M  +1    -1    project/bundles/3rdparty/ext_kf6_frameworks/kdesrc-buildrc.cmake.in

https://invent.kde.org/graphics/digikam/commit/5809dc3d9e22ca0d3b9614e4f72c19d0df72ef40

Comment 158 caulier.gilles 2022-02-11 22:40:02 UTC

Git commit bf6269cd7e7e87d4743c64cde8fb7a5db35d2728 by Gilles Caulier.
Committed on 11/02/2022 at 22:39.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

more missing install var to set.

M  +4    -0    core/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/bf6269cd7e7e87d4743c64cde8fb7a5db35d2728

Comment 159 caulier.gilles 2022-02-12 06:29:25 UTC

Git commit 8d9b949457b2e83523ad311283adf84c5a555f68 by Gilles Caulier.
Committed on 12/02/2022 at 06:28.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Bump Qt6 port as 8.0.0-git version

M  +3    -3    CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/8d9b949457b2e83523ad311283adf84c5a555f68

Comment 160 caulier.gilles 2022-02-12 13:51:06 UTC

Git commit d6a3095afab097482fd5e3fa1560855164b416be by Gilles Caulier.
Committed on 12/02/2022 at 13:50.
Pushed by cgilles into branch 'gsoc21-qt6-port'.

Qt6 port++

M  +22   -8    project/bundles/appimage/04-build-appimage.sh

https://invent.kde.org/graphics/digikam/commit/d6a3095afab097482fd5e3fa1560855164b416be

Comment 161 caulier.gilles 2022-02-12 14:10:16 UTC

Git commit 2e41759b67f9e3c4c4511ef531f1b6e51b24f612 by Gilles Caulier.
Committed on 12/02/2022 at 14:08.
Pushed by cgilles into branch 'dev'.

add notes about master and qt5-maintenance branches to deal with git codes

M  +9    -1    content/download/git.md

https://invent.kde.org/websites/digikam-org/commit/2e41759b67f9e3c4c4511ef531f1b6e51b24f612

diff --git a/content/download/git.md b/content/download/git.md
index 54501d401..61b209f79 100644
--- a/content/download/git.md
+++ b/content/download/git.md

Comment 162 caulier.gilles 2022-02-12 14:11:39 UTC

qt5-maintenance branch have been created, based on master code to release the next 7.6, 7.7, 7.8 series.

git master was merged with gsoc21-qt6-port branch and is now the code used for next 8.0.0 release.

I close this file now.

Comment 163 caulier.gilles 2022-03-15 10:48:24 UTC

Git commit bc524b1ff13320b05f6dc20bf26685fc0b9f96c1 by Gilles Caulier.
Committed on 15/03/2022 at 10:45.
Pushed by cgilles into branch 'master'.

Qt6 port ==> now whole digiKam must be ported to pure Qt6 API.
2 parts still in pending list later when KF6 API will be available: Marble and libksane
These code relevant of this API will be not a problem so far...

M  +0    -1    Mainpage.dox
D  +0    -27   TODO.Qt6
M  +0    -7    core/app/DigikamGuiTarget.cmake
M  +0    -10   core/cmake/rules/RulesQtFramework.cmake
M  +7    -3    core/libs/dplugins/core/dplugindimg.cpp
M  +0    -15   core/tests/CMakeLists.txt
M  +0    -4    core/tests/geolocation/geoiface/CMakeLists.txt
M  +0    -4    core/utilities/geolocation/geoiface/CMakeLists.txt

https://invent.kde.org/graphics/digikam/commit/bc524b1ff13320b05f6dc20bf26685fc0b9f96c1