From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 29 Jul 2014 10:51:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.3' into dev
X-Git-Tag: v5.3.99+beta1~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f598b31075e33d5b72afeb528f082d7634e731ad;p=platform%2Fupstream%2Fqttools.git

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

Change-Id: Ia75281ed8c11fcd49a5cad55a4caa3c75fa670e9
---

f598b31075e33d5b72afeb528f082d7634e731ad
diff --cc src/windeployqt/main.cpp
index b464e69,9a575d9..98ce9ef
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@@ -206,11 -207,10 +213,11 @@@ struct Options 
      bool translations;
      bool systemD3dCompiler;
      bool compilerRunTime;
 +    AngleDetection angleDetection;
      Platform platform;
-     unsigned additionalLibraries;
-     unsigned disabledLibraries;
-     unsigned updateFileFlags;
+     quint64 additionalLibraries;
+     quint64 disabledLibraries;
+     quint64 updateFileFlags;
      QStringList qmlDirectories; // Project's QML files.
      QString directory;
      QString libraryDirectory;