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

Conflicts:
  a bunch of .pro and configure.json file adjustments
  and some conflicting cherry-picks from dev -> 5.15
  that are merged into dev again

  src/assistant/assistant/main.cpp

Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2

1 files changed, 7 insertions, 1 deletions

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 4cc092956..33e243715 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -54,6 +54,7 @@ QStringList librarySearchPath;
 QString codesignIdentiy;
 QString extraEntitlements;
 bool hardenedRuntime = false;
+bool secureTimestamp = false;
 bool appstoreCompliant = false;
 int logLevel = 1;
 bool deployFramework = false;
@@ -1391,7 +1392,9 @@ void codesignFile(const QString &identity, const QString &filePath)
 
     QString codeSignLogMessage = "codesign";
     if (hardenedRuntime)
-        codeSignLogMessage += ", enable hardned runtime";
+        codeSignLogMessage += ", enable hardened runtime";
+    if (secureTimestamp)
+        codeSignLogMessage += ", include secure timestamp";
     LogNormal() << codeSignLogMessage << filePath;
 
     QStringList codeSignOptions = { "--preserve-metadata=identifier,entitlements", "--force", "-s",
@@ -1399,6 +1402,9 @@ void codesignFile(const QString &identity, const QString &filePath)
     if (hardenedRuntime)
         codeSignOptions << "-o" << "runtime";
 
+    if (secureTimestamp)
+        codeSignOptions << "--timestamp";
+
     if (!extraEntitlements.isEmpty())
         codeSignOptions << "--entitlements" << extraEntitlements;