[digikam] (5 commits) ...core/CMakeLists.txt too (#1119036)

[Rex Dieter]

Summary of changes:

  3329f03... Revert "backport "Reorder mutex lock" fix (#1091113)" (*)
  03d40c2... Merge commit '58aae0ce42395812758be5e3b71cfd8f22363a05' int (*)
  005e2c2... Merge branch 'master' into f20 (*)
  c14ec3f... Merge branch 'master' into f20 (*)
  b49f361... core/CMakeLists.txt too (#1119036) (*)

(*) This commit already existed in another branch; no separate mail sent