Merge branch 'master' of git.kde.org:digikam

Authored by cgilles on Oct 24 2018, 8:00 AM.

Description

Merge branch 'master' of git.kde.org:digikam

Merged Changes

CommitAuthorDetailsCommitted
69e02256f16fmqualmann
Revert "use private functions with QMutexLocker" 
Oct 24 2018