Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:51:13 +0000 (12:51 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:51:13 +0000 (12:51 +0200)
Change-Id: Ia75281ed8c11fcd49a5cad55a4caa3c75fa670e9

1  2 
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;