Diffusion digiKam a263bcf37243

Merge branch 'master' into gsoc19-healing-tool
a263bcf37243
Actions

Authored by ahmedfathy on Jun 11 2019, 9:56 PM.

Description

Merge branch 'master' into gsoc19-healing-tool

Details

Committed

ahmedfathy

Jun 11 2019, 9:56 PM

Parents

R482:ffe842c4dd8b: I Implemented a basic resizable functionality. It works well. Using + and…
R482:08cfc8b74bf4: use for Albums INNER JOIN is faster

Branches

Unknown

Tags

Unknown

ahmedfathy committed R482:a263bcf37243: Merge branch 'master' into gsoc19-healing-tool (authored by ahmedfathy).Jun 11 2019, 9:56 PM

Merged Changes

Commit	Author	Details	Committed
08cfc8b74bf4	mqualmann	use for Albums INNER JOIN is faster	Jun 11 2019
200d1b7c43fb	mqualmann	polish query	Jun 11 2019
55ba2b110d82	mqualmann	fix get no pick label from the DB for image quality sorter	Jun 11 2019
c38b9f3bff53	mqualmann	update	Jun 11 2019
ee99a35b0b15	mqualmann	polish	Jun 10 2019
ea011edc95c2	mqualmann	we always store the thumbnails unrotated in the DB, the question of whether the…	Jun 10 2019
0210a74a2d85	mqualmann	expand ThumbnailInfo with mime type of the file	Jun 10 2019
edb0d06f34d8	mqualmann	show video thumbnails and preview always rotated	Jun 10 2019
226aa1a95a58	mqualmann	update	Jun 10 2019
c4bef49c9b3a	cgilles	Another part wher _DATE_ macro warnings must be disable	Jun 10 2019
1979af217c82	cgilles	the -Wdate-time compiler option can be let's in top level now, have the _DATE_…	Jun 10 2019
296ad5246ad3	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 10 2019
754ee4d658f8	cgilles	add clang options to disable in test sub dir	Jun 10 2019
8a042984b9a5	cgilles	no need to use download-repos script here	Jun 10 2019
22fb81d4a915	cgilles	these clang options need to be disabled too here.	Jun 10 2019
68e7e4ce8b08	cgilles	disable this clang option here	Jun 10 2019
2d219b0bc600	cgilles	disable this compiler option with clang	Jun 10 2019
9a703eb58e36	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 10 2019
a41919bd1f11	cgilles	Stage 2: add 2 new macros to disable explicitly compiler options depending of…	Jun 10 2019
eac4ac06385b	mqualmann	polish and do not create QStringList	Jun 10 2019
bf30fe192911	mqualmann	polish and fix memory leak	Jun 10 2019
56bfea5cff98	mqualmann	fix loading Piwigo settings in the second session BUGS: 408513 FIXED-IN: 6.2.0	Jun 10 2019
dc5e6f3bc15b	cgilles	indicate the sub directory where compilation option are removed	Jun 10 2019
fbad16d68226	cgilles	this option must be remove with GCC and Clang	Jun 10 2019
6c779a3601ed	cgilles	this option must be removed for GCC and CLang	Jun 10 2019
2bf6330ba2a5	cgilles	separate macro utils than macro compiler	Jun 10 2019
bfbf39915ae6	cgilles	separate GCC and CLANG macros to remove compilation option	Jun 10 2019
2a7091014342	cgilles	first stage to factoring and separate compiler warnings options to disable in…	Jun 9 2019
c430dc1dd323	mqualmann	update	Jun 10 2019
97140a2dbd51	mqualmann	polish	Jun 10 2019
3c05d2334670	mqualmann	polish	Jun 10 2019
73d29481e669	mqualmann	this check is unnecessary and would not work with "continue" because of the…	Jun 10 2019
ecddd9f127a3	mqualmann	use QFileInfo::completeBaseName()	Jun 10 2019
c0e738dddc77	cgilles	fix clang pedantic warnings	Jun 9 2019
49e613acbd89	cgilles	fix pendantic clang warnings	Jun 9 2019
aa91f8dab22a	cgilles	more warning to hide from O2 library	Jun 9 2019
d5582a7fe542	cgilles	remove pendantic unwanted warnings from O2 library	Jun 9 2019
1142f8347fbb	cgilles	fix calng pedantic warning about puzzled i18n string with preprocessor…	Jun 9 2019
397f598f0239	cgilles	Merge branch 'master' of invent.kde.org:kde/digikam	Jun 9 2019
6d454afce849	cgilles	fix pendantic warning from clang about puzzled i18n strings with multiple…	Jun 9 2019
89d39aa0e7da	mqualmann	fix uploading the description to the images BUGS: 408466 FIXED-IN: 6.2.0	Jun 9 2019
8aca2f34ce79	mqualmann	Merge branch 'patch-5' into 'master'	Jun 9 2019
465ae7b7b69b	cgilles	update	Jun 9 2019
d050e985c8fa	chandrakant	Update README.DEVEL	May 4 2019

Changes (39)

				Path	Packages
	M			NEWS
	M			README.DEVEL
	M			core/CMakeLists.txt
	M			core/app/utils/digikam_version.h.cmake.in
	A			core/cmake/modules/MacroCompiler.cmake
	M			core/dplugins/generic/tools/calendar/wizard/calintropage.cpp
	M			core/dplugins/generic/view/glviewer/CMakeLists.txt
	M			core/dplugins/generic/view/presentation/CMakeLists.txt
	M			core/dplugins/generic/webservices/flickr/flickrtalker.cpp
	M			core/dplugins/generic/webservices/google/gphoto/gptalker.cpp
	M			core/dplugins/generic/webservices/google/gswindow.cpp
	M			core/dplugins/generic/webservices/piwigo/piwigosession.cpp
	M			core/dplugins/generic/webservices/piwigo/piwigowindow.cpp
	M			core/dplugins/generic/webservices/smugmug/smugtalker.cpp
	M			core/dplugins/generic/webservices/smugmug/smugtalker.h
	M			core/dplugins/generic/webservices/twitter/twittertalker.h
	M			core/libs/database/collection/collectionscanner.h
	M			core/libs/database/collection/collectionscanner_scan.cpp
	M			core/libs/database/coredb/coredb.cpp
	M			core/libs/database/item/containers/iteminfo.cpp
	M			core/libs/database/utils/widgets/dbsettingswidget.cpp
	M			core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
	M			core/libs/dimg/loaders/pgfloader.cpp
	M			core/libs/dplugins/webservices/CMakeLists.txt
	M			core/libs/facesengine/CMakeLists.txt
	M			core/libs/metadataengine/CMakeLists.txt
	M			core/libs/pgfutils/CMakeLists.txt
	M			core/libs/pgfutils/pgfutils.cpp
	M			core/libs/rawengine/CMakeLists.txt
	M			core/libs/threadimageio/thumb/thumbnailcreator.cpp
	M			core/libs/threadimageio/thumb/thumbnailinfo.h
	M			core/libs/video/player/mediaplayerview.cpp
	M			core/libs/video/player/slidevideo.cpp
	M			core/tests/webservices/o2/CMakeLists.txt
	M			core/utilities/setup/metadata/setupmetadata.cpp
	M			core/utilities/setup/setup.cpp
	M			project/bundles/appimage/03-build-digikam.sh
	M			project/bundles/macports/03-build-digikam.sh
	M			project/bundles/mxe/03-build-digikam.sh