Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ib8043f1dce5bcb3999965b91d3d7522fd1289eb0

diff --cc src/macdeployqt/shared/shared.cpp
index 571a0cd,a8716d7..0f9f7c7
--- 1/src/macdeployqt/shared/shared.cpp
--- 2/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@@ -46,12 -47,10 +47,14 @@@
  #include <QJsonValue>
  #include "shared.h"
  
 +#ifdef Q_OS_DARWIN
 +#include <CoreFoundation/CoreFoundation.h>
 +#endif
 +
  bool runStripEnabled = true;
  bool alwaysOwerwriteEnabled = false;
+ bool runCodesign = false;
+ QString codesignIdentiy;
  int logLevel = 1;
  
  using std::cout;