1 files changed, 41 insertions, 50 deletions

diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index 40c396ab4..a8a7f54d8 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -62,18 +62,18 @@
 
 // QtSDK specific
 #include "qtpatchoperation.h"
+#include "consumeoutputoperation.h"
 #include "setdemospathonqtoperation.h"
 #include "setexamplespathonqtoperation.h"
 #include "setpluginpathonqtcoreoperation.h"
 #include "setimportspathonqtcoreoperation.h"
 #include "setpathonqtcoreoperation.h"
-#include "registerqtvqnxoperation.h"
+#include "registerqtincreatorqnxoperation.h"
 #include "setqtcreatorvalueoperation.h"
 #include "addqtcreatorarrayvalueoperation.h"
 #include "registertoolchainoperation.h"
 #include "registerdefaultdebuggeroperation.h"
 
-
 #ifdef Q_OS_MAC
 #   include "macreplaceinstallnamesoperation.h"
 #endif // Q_OS_MAC
@@ -83,74 +83,63 @@
 #include "kdupdaterupdateoperationfactory.h"
 #include "kdupdaterfiledownloaderfactory.h"
 
-#include <unix/C/7zCrc.h>
+#include "7zCrc.h"
 
 #include <QtPlugin>
 
 #include <iostream>
 
 namespace NArchive {
-namespace NBz2 { void registerArcBZip2(); }
-namespace NGz { void registerArcGZip(); }
-namespace NLzma { namespace NLzmaAr { void registerArcLzma(); } }
-namespace NLzma { namespace NLzma86Ar { void registerArcLzma86(); } }
-namespace NSplit { void registerArcSplit(); }
-namespace NXz { void registerArcxz(); }
-namespace NZ { void registerArcZ(); }
+    namespace NXz {
+        void registerArcxz();
+    }
+    namespace NSplit {
+        void registerArcSplit();
+    }
+    namespace NLzma {
+        namespace NLzmaAr {
+            void registerArcLzma();
+        }
+        namespace NLzma86Ar {
+            void registerArcLzma86();
+        }
+    }
 }
 
 void registerArc7z();
-void registerArcCab();
-void registerArcTar();
-void registerArcZip();
 
-void registerCodecBCJ2();
-void registerCodecBCJ();
 void registerCodecBCJ();
-void registerCodecByteSwap();
-void registerCodecBZip2();
-void registerCodecCopy();
-void registerCodecDeflate64();
-void registerCodecDeflate();
-void registerCodecDelta();
-void registerCodecLZMA2();
+void registerCodecBCJ2();
+
 void registerCodecLZMA();
-void registerCodecPPMD();
-void registerCodec7zAES();
+void registerCodecLZMA2();
+
+void registerCodecDelta();
+void registerCodecBranch();
+void registerCodecByteSwap();
 
-using namespace NArchive;
 using namespace KDUpdater;
 using namespace QInstaller;
 
 static void initArchives()
 {
-    NBz2::registerArcBZip2();
-    NGz::registerArcGZip();
-    NLzma::NLzmaAr::registerArcLzma();
-    NLzma::NLzma86Ar::registerArcLzma86();
-    NSplit::registerArcSplit();
-    NXz::registerArcxz();
-    NZ::registerArcZ();
+    CrcGenerateTable();
+
     registerArc7z();
-    registerArcCab();
-    registerArcTar();
-    registerArcZip();
 
-    registerCodecBCJ2();
-    registerCodecBCJ();
     registerCodecBCJ();
-    registerCodecByteSwap();
-    registerCodecBZip2();
-    registerCodecCopy();
-    registerCodecDeflate64();
-    registerCodecDeflate();
-    registerCodecDelta();
-    registerCodecLZMA2();
+    registerCodecBCJ2();
     registerCodecLZMA();
-    registerCodecPPMD();
-    registerCodec7zAES();
+    registerCodecLZMA2();
 
-    CrcGenerateTable();
+    registerCodecDelta();
+    registerCodecBranch();
+    registerCodecByteSwap();
+
+    NArchive::NXz::registerArcxz();
+    NArchive::NSplit::registerArcSplit();
+    NArchive::NLzma::NLzmaAr::registerArcLzma();
+    NArchive::NLzma::NLzma86Ar::registerArcLzma86();
 }
 
 #if defined(QT_STATIC)
@@ -205,8 +194,9 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
 {
     QByteArray ba = trimAndPrepend(type, msg.toLocal8Bit());
     if (type != QtDebugMsg) {
-        ba += QByteArray(" (") + context.file + QByteArray(":").append(context.line) + QByteArray(", ")
-            + context.function + QByteArray(")");
+        ba += QString(QStringLiteral(" (%1:%2, %3)")).arg(
+                    QString::fromLatin1(context.file)).arg(context.line).arg(
+                    QString::fromLatin1(context.function)).toLocal8Bit();
     }
 #endif
 
@@ -229,8 +219,8 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
 
 void QInstaller::init()
 {
-#if defined(QT_STATIC)
     ::initArchives();
+#if defined(QT_STATIC)
     ::initResources();
 #endif
 
@@ -254,6 +244,7 @@ void QInstaller::init()
     factory.registerUpdateOperation<MinimumProgressOperation>(QLatin1String("MinimumProgress"));
     factory.registerUpdateOperation<LicenseOperation>(QLatin1String("License"));
     factory.registerUpdateOperation<ApplyProductKeyOperation>(QLatin1String("ApplyProductKey"));
+    factory.registerUpdateOperation<ConsumeOutputOperation>(QLatin1String("ConsumeOutput"));
 
     // QtSDK specific
     factory.registerUpdateOperation<RegisterQtInCreatorQNXOperation>(QLatin1String("RegisterQtInCreatorQNX"));