From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Mon, 20 Oct 2014 17:13:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.4' into dev
X-Git-Tag: v5.5.90+alpha1~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b22b397f6654ca34858943933bf61d363a389aab;p=platform%2Fupstream%2Fqttools.git

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

Change-Id: Ib8043f1dce5bcb3999965b91d3d7522fd1289eb0
---

b22b397f6654ca34858943933bf61d363a389aab
diff --cc src/macdeployqt/shared/shared.cpp
index 571a0cd,a8716d7..0f9f7c7
--- a/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;