Move class BinaryContent into its own file.

Prepare for QTIFW-292 and QTIFW-345.

Change-Id: I938b5aa728e8f81eb9521df5753ad80ac630d96e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

17 files changed, 664 insertions, 557 deletions

diff --git a/src/libs/installer/binarycontent.cpp b/src/libs/installer/binarycontent.cpp
new file mode 100644
index 000000000..27c486353
--- /dev/null
+++ b/src/libs/installer/binarycontent.cpp
@@ -0,0 +1,527 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
+#include "binarycontent.h"
+
+#include "binaryformat.h"
+#include "binaryformatenginehandler.h"
+#include "errors.h"
+#include "fileio.h"
+#include "fileutils.h"
+#include "kdupdaterupdateoperationfactory.h"
+#include "utils.h"
+
+#include <QFile>
+#include <QResource>
+
+/*!
+    Search through 1MB, if smaller through the whole file. Note: QFile::map() does
+    not change QFile::pos(). Fallback to read the file content in case we can't map it.
+
+    Note: Failing to map the file can happen for example while having a remote connection
+    established to the admin server process and we do not support map over the socket.
+*/
+qint64 QInstaller::findMagicCookie(QFile *in, quint64 magicCookie)
+{
+    Q_ASSERT(in);
+    Q_ASSERT(in->isOpen());
+    Q_ASSERT(in->isReadable());
+
+    const qint64 fileSize = in->size();
+    const size_t markerSize = sizeof(qint64);
+    const qint64 maxSearch = qMin((1024LL * 1024LL), fileSize);
+
+    QByteArray data(maxSearch, Qt::Uninitialized);
+    uchar *const mapped = in->map(fileSize - maxSearch, maxSearch);
+    if (!mapped) {
+        const int pos = in->pos();
+        try {
+            in->seek(fileSize - maxSearch);
+            QInstaller::blockingRead(in, data.data(), maxSearch);
+            in->seek(pos);
+        } catch (const Error &error) {
+            in->seek(pos);
+            throw error;
+        }
+    } else {
+        data = QByteArray((const char*) mapped, maxSearch);
+        in->unmap(mapped);
+    }
+
+    qint64 searched = maxSearch - markerSize;
+    while (searched >= 0) {
+        if (memcmp(&magicCookie, (data.data() + searched), markerSize) == 0)
+            return (fileSize - maxSearch) + searched;
+        --searched;
+    }
+    throw Error(QCoreApplication::translate("QInstaller", "No marker found, stopped after %1.")
+        .arg(humanReadableSize(maxSearch)));
+
+    return -1; // never reached
+}
+
+namespace QInstaller {
+
+/*!
+    \internal
+    Registers the resource found at \a segment within \a file into the Qt resource system.
+*/
+static QByteArray addResourceFromBinary(QFile* file, const Range<qint64> &segment)
+{
+    if (segment.length() <= 0)
+        return 0;
+
+    if (!file->seek(segment.start())) {
+        throw Error(QCoreApplication::translate("BinaryContent",
+            "Could not seek to in-binary resource. (offset: %1, length: %2)")
+            .arg(QString::number(segment.start()), QString::number(segment.length())));
+    }
+
+    QByteArray ba = QInstaller::retrieveData(file, segment.length());
+    if (!QResource::registerResource((const uchar*) ba.constData(), QLatin1String(":/metadata"))) {
+        throw Error(QCoreApplication::translate("BinaryContent",
+            "Could not register in-binary resource."));
+    }
+    return ba;
+}
+
+
+// -- Private
+
+class BinaryContent::Private : public QSharedData
+{
+public:
+    Private();
+    explicit Private(const QString &path);
+    Private(const Private &other);
+    ~Private();
+
+    qint64 m_magicMarker;
+    qint64 m_dataBlockStart;
+
+    QSharedPointer<QFile> m_appBinary;
+    QSharedPointer<QFile> m_binaryDataFile;
+
+    QList<Operation *> m_performedOperations;
+    QList<QPair<QString, QString> > m_performedOperationsData;
+
+    QVector<QByteArray> m_resourceMappings;
+    QVector<Range<qint64> > m_metadataResourceSegments;
+
+    QInstallerCreator::ComponentIndex m_componentIndex;
+    QInstallerCreator::BinaryFormatEngineHandler m_binaryFormatEngineHandler;
+};
+
+
+BinaryContent::Private::Private()
+    : m_magicMarker(Q_INT64_C(0))
+    , m_dataBlockStart(Q_INT64_C(0))
+    , m_appBinary(0)
+    , m_binaryDataFile(0)
+    , m_binaryFormatEngineHandler(m_componentIndex)
+{}
+
+BinaryContent::Private::Private(const QString &path)
+    : m_magicMarker(Q_INT64_C(0))
+    , m_dataBlockStart(Q_INT64_C(0))
+    , m_appBinary(new QFile(path))
+    , m_binaryDataFile(0)
+    , m_binaryFormatEngineHandler(m_componentIndex)
+{}
+
+BinaryContent::Private::Private(const Private &other)
+    : QSharedData(other)
+    , m_magicMarker(other.m_magicMarker)
+    , m_dataBlockStart(other.m_dataBlockStart)
+    , m_appBinary(other.m_appBinary)
+    , m_binaryDataFile(other.m_binaryDataFile)
+    , m_performedOperations(other.m_performedOperations)
+    , m_performedOperationsData(other.m_performedOperationsData)
+    , m_resourceMappings(other.m_resourceMappings)
+    , m_metadataResourceSegments(other.m_metadataResourceSegments)
+    , m_componentIndex(other.m_componentIndex)
+    , m_binaryFormatEngineHandler(other.m_binaryFormatEngineHandler)
+{}
+
+BinaryContent::Private::~Private()
+{
+    foreach (const QByteArray &rccData, m_resourceMappings)
+        QResource::unregisterResource((const uchar*) rccData.constData(), QLatin1String(":/metadata"));
+    m_resourceMappings.clear();
+}
+
+
+// -- BinaryContent
+
+BinaryContent::BinaryContent()
+    : d(new Private)
+{}
+
+BinaryContent::~BinaryContent()
+{}
+
+BinaryContent::BinaryContent(const QString &path)
+    : d(new Private(path))
+{}
+
+BinaryContent::BinaryContent(const BinaryContent &rhs)
+    : d(rhs.d)
+{}
+
+BinaryContent &BinaryContent::operator=(const BinaryContent &rhs)
+{
+    if (this != &rhs)
+        d = rhs.d;
+    return *this;
+}
+
+/*!
+    Reads binary content stored in the passed application binary. Maps the embedded resources into
+    memory and instantiates performed operations if available.
+*/
+BinaryContent BinaryContent::readAndRegisterFromBinary(const QString &path)
+{
+    BinaryContent c = BinaryContent::readFromBinary(path);
+    c.registerEmbeddedQResources();
+    c.registerPerformedOperations();
+    return c;
+}
+
+/*!
+* \class QInstaller::BinaryContent
+*
+* BinaryContent handles binary information embedded into executables.
+* Qt resources as well as component information can be stored.
+*
+* Explanation of the binary blob at the end of the installer or separate data file:
+*
+* \verbatim
+* Meta data segment 0
+* Meta data segment ...
+* Meta data segment n
+* ------------------------------------------------------
+* Component data segment 0
+* Component data segment ..
+* Component data segment n
+* ------------------------------------------------------
+* Component index segment
+* ------------------------------------------------------
+* quint64 offset of component index segment
+* quint64 length of component index segment
+* ------------------------------------------------------
+* qint64 offset of meta data segment 0
+* qint64 length of meta data segment 0
+* qint64 offset of meta data segment ..
+* qint64 length of meta data segment ..
+* qint64 offset of meta data segment n
+* qint64 length of meta data segment n
+* ------------------------------------------------------
+* operations start offest
+* operations end
+* quint64 embedded resource count
+* quint64 data block size
+* quint64 Magic marker
+* quint64 Magic cookie (0xc2 0x63 0x0a 0x1c 0x99 0xd6 0x68 0xf8)
+* <eof>
+*
+* All offsets are addresses relative to the end of the file.
+*
+* Meta data segments are stored as Qt resources, which must be "mounted"
+* via QResource::registerResource()
+*
+* Component index segment:
+* quint64 number of index entries
+* QString identifier of component 0
+* quint64 offset of component data segment 0
+* quint64 length of component data segment 0
+* QString identifier of component ..
+* quint64 offset of component data segment ..
+* quint64 length of component data segment ..
+* QString identifier of component n
+* quint64 offset of component data segment n
+* quint64 length of component data segment n
+* quint64 number of index entries
+*
+* Component data segment:
+* quint64 number of archives in this component
+* QString name of archive 0
+* quint64 offset of archive 0
+* quint64 length of archive 0
+* QString name of archive ..
+* quint64 offset of archive ..
+* quint64 length of archive ..
+* QString name of archive n
+* quint64 offset of archive n
+* quint64 length of archive n
+* Archive 0
+* Archive ..
+* Archive n
+* \endverbatim
+*/
+
+BinaryContent BinaryContent::readFromBinary(const QString &path)
+{
+    BinaryContent c(path);
+
+    // Try to read the binary layout of the calling application. We need to figure out
+    // if we are in installer or an unistaller (maintenance, package manager, updater) binary.
+    QInstaller::openForRead(c.d->m_appBinary.data());
+    quint64 cookiePos = findMagicCookie(c.d->m_appBinary.data(), QInstaller::MagicCookie);
+    if (!c.d->m_appBinary->seek(cookiePos - sizeof(qint64))) {   // seek to read the marker
+        throw Error(QCoreApplication::translate("BinaryContent",
+            "Could not seek to %1 to read the magic marker.").arg(cookiePos - sizeof(qint64)));
+    }
+    const qint64 magicMarker = QInstaller::retrieveInt64(c.d->m_appBinary.data());
+
+    if (magicMarker != MagicInstallerMarker) {
+        // We are not an installer, so we need to read the data from the .dat file.
+
+        QFileInfo fi(path);
+        QString bundlePath; // On OSX it's not inside the bundle, deserves TODO.
+        if (QInstaller::isInBundle(fi.absoluteFilePath(), &bundlePath))
+            fi.setFile(bundlePath);
+
+        c.d->m_binaryDataFile.reset(new QFile(fi.absolutePath() + QLatin1Char('/') + fi.baseName()
+            + QLatin1String(".dat")));
+        QInstaller::openForRead(c.d->m_binaryDataFile.data());
+        cookiePos = findMagicCookie(c.d->m_binaryDataFile.data(), QInstaller::MagicCookieDat);
+        readBinaryData(c, c.d->m_binaryDataFile, readBinaryLayout(c.d->m_binaryDataFile.data(),
+            cookiePos));
+    } else {
+        // We are an installer, all data is appended to our binary itself.
+        readBinaryData(c, c.d->m_appBinary, readBinaryLayout(c.d->m_appBinary.data(), cookiePos));
+    }
+    return c;
+}
+
+/* static */
+BinaryLayout BinaryContent::readBinaryLayout(QFile *const file, qint64 cookiePos)
+{
+    const qint64 indexSize = 5 * sizeof(qint64);
+    if (!file->seek(cookiePos - indexSize)) {
+        throw Error(QCoreApplication::translate("BinaryContent",
+            "Could not seek to binary layout section."));
+    }
+
+    BinaryLayout layout;
+    layout.operationsStart = QInstaller::retrieveInt64(file);
+    layout.operationsEnd = QInstaller::retrieveInt64(file);
+    layout.resourceCount = QInstaller::retrieveInt64(file);
+    layout.dataBlockSize = QInstaller::retrieveInt64(file);
+    layout.magicMarker = QInstaller::retrieveInt64(file);
+    layout.magicCookie = QInstaller::retrieveInt64(file);
+    layout.indexSize = indexSize + sizeof(qint64);
+    layout.endOfData = file->pos();
+
+    qDebug() << "Operations start:" << layout.operationsStart;
+    qDebug() << "Operations end:" << layout.operationsEnd;
+    qDebug() << "Resource count:" << layout.resourceCount;
+    qDebug() << "Data block size:" << layout.dataBlockSize;
+    qDebug() << "Magic marker:" << layout.magicMarker;
+    qDebug() << "Magic cookie:" << layout.magicCookie;
+    qDebug() << "Index size:" << layout.indexSize;
+    qDebug() << "End of data:" << layout.endOfData;
+
+    const qint64 resourceOffsetAndLengtSize = 2 * sizeof(qint64);
+    const qint64 dataBlockStart = layout.endOfData - layout.dataBlockSize;
+    for (int i = 0; i < layout.resourceCount; ++i) {
+        const qint64 offset = layout.endOfData - layout.indexSize
+            - (resourceOffsetAndLengtSize * (i + 1));
+        if (!file->seek(offset)) {
+            throw Error(QCoreApplication::translate("BinaryContent",
+                "Could not seek to metadata index."));
+        }
+        const qint64 metadataResourceOffset = QInstaller::retrieveInt64(file);
+        const qint64 metadataResourceLength = QInstaller::retrieveInt64(file);
+        layout.metadataResourceSegments.append(Range<qint64>::fromStartAndLength(metadataResourceOffset
+            + dataBlockStart, metadataResourceLength));
+    }
+
+    return layout;
+}
+
+/* static */
+void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
+    const BinaryLayout &layout)
+{
+    content.d->m_magicMarker = layout.magicMarker;
+    content.d->m_metadataResourceSegments = layout.metadataResourceSegments;
+
+    const qint64 dataBlockStart = layout.endOfData - layout.dataBlockSize;
+    const qint64 operationsStart = layout.operationsStart + dataBlockStart;
+    if (!file->seek(operationsStart))
+        throw Error(QCoreApplication::translate("BinaryContent", "Could not seek to operation list."));
+
+    const qint64 operationsCount = QInstaller::retrieveInt64(file.data());
+    qDebug() << "Number of operations:" << operationsCount;
+
+    for (int i = 0; i < operationsCount; ++i) {
+        const QString name = QInstaller::retrieveString(file.data());
+        const QString data = QInstaller::retrieveString(file.data());
+        content.d->m_performedOperationsData.append(qMakePair(name, data));
+    }
+
+    // seek to the position of the component index
+    const qint64 resourceOffsetAndLengtSize = 2 * sizeof(qint64);
+    const qint64 resourceSectionSize = resourceOffsetAndLengtSize * layout.resourceCount;
+    const qint64 offset = layout.endOfData - layout.indexSize - resourceSectionSize
+        - resourceOffsetAndLengtSize;
+    if (!file->seek(offset)) {
+        throw Error(QCoreApplication::translate("BinaryContent",
+            "Could not seek to component index information."));
+    }
+    const qint64 compIndexStart = QInstaller::retrieveInt64(file.data()) + dataBlockStart;
+    if (!file->seek(compIndexStart))
+        throw Error(QCoreApplication::translate("BinaryContent", "Could not seek to component index."));
+
+    content.d->m_componentIndex = QInstallerCreator::ComponentIndex::read(file, dataBlockStart);
+    content.d->m_binaryFormatEngineHandler.setComponentIndex(content.d->m_componentIndex);
+
+    if (QInstaller::isVerbose()) {
+        const QVector<QInstallerCreator::Component> components = content.d->m_componentIndex.components();
+        qDebug() << "Number of components loaded:" << components.count();
+        foreach (const QInstallerCreator::Component &component, components) {
+            const QVector<QSharedPointer<QInstallerCreator::Archive> > archives = component.archives();
+            qDebug() << component.name().data() << "loaded...";
+            QStringList archivesWithSize;
+            foreach (const QSharedPointer<QInstallerCreator::Archive> &archive, archives) {
+                archivesWithSize.append(QString::fromLatin1("%1 - %2")
+                    .arg(QString::fromUtf8(archive->name()), humanReadableSize(archive->size())));
+            }
+            if (!archivesWithSize.isEmpty()) {
+                qDebug() << " - " << archives.count() << "archives: "
+                    << qPrintable(archivesWithSize.join(QLatin1String("; ")));
+            }
+        }
+    }
+}
+
+/*!
+    Registers already performed operations.
+*/
+int BinaryContent::registerPerformedOperations()
+{
+    if (d->m_performedOperations.count() > 0)
+        return d->m_performedOperations.count();
+
+    for (int i = 0; i < d->m_performedOperationsData.count(); ++i) {
+        const QPair<QString, QString> opPair = d->m_performedOperationsData.at(i);
+        QScopedPointer<Operation> op(KDUpdater::UpdateOperationFactory::instance().create(opPair.first));
+        if (op.isNull()) {
+            qWarning() << QString::fromLatin1("Failed to load unknown operation %1").arg(opPair.first);
+            continue;
+        }
+
+        if (!op->fromXml(opPair.second)) {
+            qWarning() << "Failed to load XML for operation:" << opPair.first;
+            continue;
+        }
+        d->m_performedOperations.append(op.take());
+    }
+    return d->m_performedOperations.count();
+}
+
+/*!
+    Returns the operations performed during installation. Returns an empty list if no operations
+    are instantiated, performed or the binary is the installer application.
+*/
+OperationList BinaryContent::performedOperations() const
+{
+    return d->m_performedOperations;
+}
+
+/*!
+    Returns the magic marker found in the binary. Returns 0 if no marker has been found.
+*/
+qint64 BinaryContent::magicMarker() const
+{
+    return d->m_magicMarker;
+}
+
+/*!
+    Registers the Qt resources embedded in this binary.
+*/
+int BinaryContent::registerEmbeddedQResources()
+{
+    if (d->m_resourceMappings.count() > 0)
+        return d->m_resourceMappings.count();
+
+    const bool hasBinaryDataFile = !d->m_binaryDataFile.isNull();
+    QFile *const data = hasBinaryDataFile ? d->m_binaryDataFile.data() : d->m_appBinary.data();
+    if (data != 0 && !data->isOpen() && !data->open(QIODevice::ReadOnly)) {
+        throw Error(QCoreApplication::translate("BinaryContent", "Could not open binary %1: %2")
+            .arg(data->fileName(), data->errorString()));
+    }
+
+    foreach (const Range<qint64> &i, d->m_metadataResourceSegments)
+        d->m_resourceMappings.append(addResourceFromBinary(data, i));
+
+    d->m_appBinary.clear();
+    if (hasBinaryDataFile)
+        d->m_binaryDataFile.clear();
+
+    return d->m_resourceMappings.count();
+}
+
+/*!
+    Registers the passed file as default resource content. If the embedded resources are already
+    mapped into memory, it will replace the first with the new content.
+*/
+void BinaryContent::registerAsDefaultQResource(const QString &path)
+{
+    QFile resource(path);
+    bool success = resource.open(QIODevice::ReadOnly);
+    if (success && (d->m_resourceMappings.count() > 0)) {
+        success = QResource::unregisterResource((const uchar*) d->m_resourceMappings.first()
+            .constData(), QLatin1String(":/metadata"));
+        if (success)
+            d->m_resourceMappings.remove(0);
+    }
+
+    if (success) {
+        d->m_resourceMappings.prepend(addResourceFromBinary(&resource,
+            Range<qint64>::fromStartAndEnd(0, resource.size())));
+    } else {
+        qWarning() << QString::fromLatin1("Could not register '%1' as default resource.").arg(path);
+    }
+}
+
+} // namespace QInstaller
diff --git a/src/libs/installer/binarycontent.h b/src/libs/installer/binarycontent.h
new file mode 100644
index 000000000..bbd66d4c7
--- /dev/null
+++ b/src/libs/installer/binarycontent.h
@@ -0,0 +1,113 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
+#ifndef BINARYCONTENT_H
+#define BINARYCONTENT_H
+
+#include "range.h"
+#include "qinstallerglobal.h"
+
+#include <QVector>
+
+QT_BEGIN_NAMESPACE
+class QFile;
+QT_END_NAMESPACE
+
+namespace QInstaller {
+
+static const qint64 MagicInstallerMarker = 0x12023233UL;
+static const qint64 MagicUninstallerMarker = 0x12023234UL;
+
+static const qint64 MagicUpdaterMarker = 0x12023235UL;
+static const qint64 MagicPackageManagerMarker = 0x12023236UL;
+
+// this cookie is put at the end of the file to determine whether we have data
+static const quint64 MagicCookie = 0xc2630a1c99d668f8LL;
+static const quint64 MagicCookieDat = 0xc2630a1c99d668f9LL;
+
+qint64 INSTALLER_EXPORT findMagicCookie(QFile *file, quint64 magicCookie = MagicCookie);
+
+struct BinaryLayout
+{
+    QVector<Range<qint64> > metadataResourceSegments;
+    qint64 operationsStart;
+    qint64 operationsEnd;
+    qint64 resourceCount;
+    qint64 dataBlockSize;
+    qint64 magicMarker;
+    quint64 magicCookie;
+    qint64 indexSize;
+    qint64 endOfData;
+};
+
+class INSTALLER_EXPORT BinaryContent
+{
+public:
+    BinaryContent();
+    ~BinaryContent();
+
+    BinaryContent(const BinaryContent &rhs);
+    BinaryContent &operator=(const BinaryContent &rhs);
+
+    static BinaryContent readFromBinary(const QString &path);
+    static BinaryContent readAndRegisterFromBinary(const QString &path);
+    static BinaryLayout readBinaryLayout(QFile *const file, qint64 cookiePos);
+
+    int registerPerformedOperations();
+    OperationList performedOperations() const;
+
+    qint64 magicMarker() const;
+    int registerEmbeddedQResources();
+    void registerAsDefaultQResource(const QString &path);
+
+private:
+    explicit BinaryContent(const QString &path);
+    static void readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
+        const BinaryLayout &layout);
+
+private:
+    class Private;
+    QSharedDataPointer<Private> d;
+};
+
+} // namespace QInstaller
+
+#endif // BINARYCONTENT_H
diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp
index aaa1fcfc2..538e51fe7 100644
--- a/src/libs/installer/binaryformat.cpp
+++ b/src/libs/installer/binaryformat.cpp
@@ -43,61 +43,8 @@
 
 #include "errors.h"
 #include "fileio.h"
-#include "fileutils.h"
-#include "utils.h"
-
-#include "kdupdaterupdateoperationfactory.h"
-
-#include <QDebug>
-#include <QResource>
-#include <QTemporaryFile>
-
-/*!
-    Search through 1MB, if smaller through the whole file. Note: QFile::map() does
-    not change QFile::pos(). Fallback to read the file content in case we can't map it.
-
-    Note: Failing to map the file can happen for example while having a remote connection
-          established to the admin server process and we do not support map over the socket.
-*/
-qint64 QInstaller::findMagicCookie(QFile *in, quint64 magicCookie)
-{
-    Q_ASSERT(in);
-    Q_ASSERT(in->isOpen());
-    Q_ASSERT(in->isReadable());
-
-    const qint64 fileSize = in->size();
-    const size_t markerSize = sizeof(qint64);
-    const qint64 maxSearch = qMin((1024LL * 1024LL), fileSize);
-
-    QByteArray data(maxSearch, Qt::Uninitialized);
-    uchar *const mapped = in->map(fileSize - maxSearch, maxSearch);
-    if (!mapped) {
-        const int pos = in->pos();
-        try {
-            in->seek(fileSize - maxSearch);
-            QInstaller::blockingRead(in, data.data(), maxSearch);
-            in->seek(pos);
-        } catch (const Error &error) {
-            in->seek(pos);
-            throw error;
-        }
-    } else {
-        data = QByteArray((const char*)mapped, maxSearch);
-        in->unmap(mapped);
-    }
-
-    qint64 searched = maxSearch - markerSize;
-    while (searched >= 0) {
-        if (memcmp(&magicCookie, (data.data() + searched), markerSize) == 0)
-            return (fileSize - maxSearch) + searched;
-        --searched;
-    }
-    throw Error(QCoreApplication::translate("QInstaller", "No marker found, stopped after %1.")
-        .arg(humanReadableSize(maxSearch)));
-
-    return -1; // never reached
-}
 
+#include <QFileInfo>
 
 namespace QInstallerCreator {
 
@@ -442,410 +389,3 @@ int ComponentIndex::componentCount() const
 }
 
 } // namespace QInstallerCreator
-
-namespace QInstaller {
-
-/*!
-    \internal
-    Registers the resource found at \a segment within \a file into the Qt resource system.
- */
-static QByteArray addResourceFromBinary(QFile* file, const Range<qint64> &segment)
-{
-    if (segment.length() <= 0)
-        return 0;
-
-    if (!file->seek(segment.start())) {
-        throw Error(QCoreApplication::translate("BinaryContent",
-            "Could not seek to in-binary resource. (offset: %1, length: %2)")
-            .arg(QString::number(segment.start()), QString::number(segment.length())));
-    }
-
-    QByteArray ba = QInstaller::retrieveData(file, segment.length());
-    if (!QResource::registerResource((const uchar*)ba.constData(), QLatin1String(":/metadata"))) {
-            throw Error(QCoreApplication::translate("BinaryContent",
-                "Could not register in-binary resource."));
-    }
-    return ba;
-}
-
-
-// -- BinaryContentPrivate
-
-BinaryContentPrivate::BinaryContentPrivate()
-    : m_magicMarker(Q_INT64_C(0))
-    , m_dataBlockStart(Q_INT64_C(0))
-    , m_appBinary(0)
-    , m_binaryDataFile(0)
-    , m_binaryFormatEngineHandler(m_componentIndex)
-{
-}
-
-BinaryContentPrivate::BinaryContentPrivate(const QString &path)
-    : m_magicMarker(Q_INT64_C(0))
-    , m_dataBlockStart(Q_INT64_C(0))
-    , m_appBinary(new QFile(path))
-    , m_binaryDataFile(0)
-    , m_binaryFormatEngineHandler(m_componentIndex)
-{
-}
-
-BinaryContentPrivate::BinaryContentPrivate(const BinaryContentPrivate &other)
-    : QSharedData(other)
-    , m_magicMarker(other.m_magicMarker)
-    , m_dataBlockStart(other.m_dataBlockStart)
-    , m_appBinary(other.m_appBinary)
-    , m_binaryDataFile(other.m_binaryDataFile)
-    , m_performedOperations(other.m_performedOperations)
-    , m_performedOperationsData(other.m_performedOperationsData)
-    , m_resourceMappings(other.m_resourceMappings)
-    , m_metadataResourceSegments(other.m_metadataResourceSegments)
-    , m_componentIndex(other.m_componentIndex)
-    , m_binaryFormatEngineHandler(other.m_binaryFormatEngineHandler)
-{
-}
-
-BinaryContentPrivate::~BinaryContentPrivate()
-{
-    foreach (const QByteArray &rccData, m_resourceMappings)
-        QResource::unregisterResource((const uchar*)rccData.constData(), QLatin1String(":/metadata"));
-    m_resourceMappings.clear();
-}
-
-
-// -- BinaryContent
-
-BinaryContent::BinaryContent()
-    : d(new BinaryContentPrivate)
-{
-}
-
-BinaryContent::BinaryContent(const QString &path)
-    : d(new BinaryContentPrivate(path))
-{
-}
-
-BinaryContent::BinaryContent(const BinaryContent &rhs)
-    : d(rhs.d)
-{
-}
-
-/*!
-    Reads binary content stored in the passed application binary. Maps the embedded resources into memory
-    and instantiates performed operations if available.
-*/
-BinaryContent BinaryContent::readAndRegisterFromBinary(const QString &path)
-{
-    BinaryContent c = BinaryContent::readFromBinary(path);
-    c.registerEmbeddedQResources();
-    c.registerPerformedOperations();
-    return c;
-}
-
-/*!
- * \class QInstaller::BinaryContent
- *
- * BinaryContent handles binary information embedded into executables.
- * Qt resources as well as component information can be stored.
- *
- * Explanation of the binary blob at the end of the installer or separate data file:
- *
- * \verbatim
- * Meta data segment 0
- * Meta data segment ...
- * Meta data segment n
- * ------------------------------------------------------
- * Component data segment 0
- * Component data segment ..
- * Component data segment n
- * ------------------------------------------------------
- * Component index segment
- * ------------------------------------------------------
- * quint64 offset of component index segment
- * quint64 length of component index segment
- * ------------------------------------------------------
- * qint64 offset of meta data segment 0
- * qint64 length of meta data segment 0
- * qint64 offset of meta data segment ..
- * qint64 length of meta data segment ..
- * qint64 offset of meta data segment n
- * qint64 length of meta data segment n
- * ------------------------------------------------------
- * operations start offest
- * operations end
- * quint64 embedded resource count
- * quint64 data block size
- * quint64 Magic marker
- * quint64 Magic cookie (0xc2 0x63 0x0a 0x1c 0x99 0xd6 0x68 0xf8)
- * <eof>
- *
- * All offsets are addresses relative to the end of the file.
- *
- * Meta data segments are stored as Qt resources, which must be "mounted"
- * via QResource::registerResource()
- *
- * Component index segment:
- * quint64 number of index entries
- * QString identifier of component 0
- * quint64 offset of component data segment 0
- * quint64 length of component data segment 0
- * QString identifier of component ..
- * quint64 offset of component data segment ..
- * quint64 length of component data segment ..
- * QString identifier of component n
- * quint64 offset of component data segment n
- * quint64 length of component data segment n
- * quint64 number of index entries
- *
- * Component data segment:
- * quint64 number of archives in this component
- * QString name of archive 0
- * quint64 offset of archive 0
- * quint64 length of archive 0
- * QString name of archive ..
- * quint64 offset of archive ..
- * quint64 length of archive ..
- * QString name of archive n
- * quint64 offset of archive n
- * quint64 length of archive n
- * Archive 0
- * Archive ..
- * Archive n
- * \endverbatim
- */
-
-BinaryContent BinaryContent::readFromBinary(const QString &path)
-{
-    BinaryContent c(path);
-
-    // Try to read the binary layout of the calling application. We need to figure out
-    // if we are in installer or an unistaller (maintenance, package manager, updater) binary.
-    QInstaller::openForRead(c.d->m_appBinary.data());
-    quint64 cookiePos = findMagicCookie(c.d->m_appBinary.data(), QInstaller::MagicCookie);
-    if (!c.d->m_appBinary->seek(cookiePos - sizeof(qint64))) {   // seek to read the marker
-        throw Error(QCoreApplication::translate("BinaryContent",
-            "Could not seek to %1 to read the magic marker.").arg(cookiePos - sizeof(qint64)));
-    }
-    const qint64 magicMarker = QInstaller::retrieveInt64(c.d->m_appBinary.data());
-
-    if (magicMarker != MagicInstallerMarker) {
-        // We are not an installer, so we need to read the data from the .dat file.
-
-        QFileInfo fi(path);
-        QString bundlePath; // On OSX it's not inside the bundle, deserves TODO.
-        if (QInstaller::isInBundle(fi.absoluteFilePath(), &bundlePath))
-            fi.setFile(bundlePath);
-
-        c.d->m_binaryDataFile.reset(new QFile(fi.absolutePath() + QLatin1Char('/') + fi.baseName()
-            + QLatin1String(".dat")));
-        QInstaller::openForRead(c.d->m_binaryDataFile.data());
-        cookiePos = findMagicCookie(c.d->m_binaryDataFile.data(), QInstaller::MagicCookieDat);
-        readBinaryData(c, c.d->m_binaryDataFile, readBinaryLayout(c.d->m_binaryDataFile.data(),
-            cookiePos));
-    } else {
-        // We are an installer, all data is appended to our binary itself.
-        readBinaryData(c, c.d->m_appBinary, readBinaryLayout(c.d->m_appBinary.data(), cookiePos));
-    }
-    return c;
-}
-
-/* static */
-BinaryLayout BinaryContent::readBinaryLayout(QFile *const file, qint64 cookiePos)
-{
-    const qint64 indexSize = 5 * sizeof(qint64);
-    if (!file->seek(cookiePos - indexSize)) {
-        throw Error(QCoreApplication::translate("BinaryContent",
-            "Could not seek to binary layout section."));
-    }
-
-    BinaryLayout layout;
-    layout.operationsStart = QInstaller::retrieveInt64(file);
-    layout.operationsEnd = QInstaller::retrieveInt64(file);
-    layout.resourceCount = QInstaller::retrieveInt64(file);
-    layout.dataBlockSize = QInstaller::retrieveInt64(file);
-    layout.magicMarker = QInstaller::retrieveInt64(file);
-    layout.magicCookie = QInstaller::retrieveInt64(file);
-    layout.indexSize = indexSize + sizeof(qint64);
-    layout.endOfData = file->pos();
-
-    qDebug() << "Operations start:" << layout.operationsStart;
-    qDebug() << "Operations end:" << layout.operationsEnd;
-    qDebug() << "Resource count:" << layout.resourceCount;
-    qDebug() << "Data block size:" << layout.dataBlockSize;
-    qDebug() << "Magic marker:" << layout.magicMarker;
-    qDebug() << "Magic cookie:" << layout.magicCookie;
-    qDebug() << "Index size:" << layout.indexSize;
-    qDebug() << "End of data:" << layout.endOfData;
-
-    const qint64 resourceOffsetAndLengtSize = 2 * sizeof(qint64);
-    const qint64 dataBlockStart = layout.endOfData - layout.dataBlockSize;
-    for (int i = 0; i < layout.resourceCount; ++i) {
-        const qint64 offset = layout.endOfData - layout.indexSize
-            - (resourceOffsetAndLengtSize * (i + 1));
-        if (!file->seek(offset)) {
-            throw Error(QCoreApplication::translate("BinaryContent",
-                "Could not seek to metadata index."));
-        }
-        const qint64 metadataResourceOffset = QInstaller::retrieveInt64(file);
-        const qint64 metadataResourceLength = QInstaller::retrieveInt64(file);
-        layout.metadataResourceSegments.append(Range<qint64>::fromStartAndLength(metadataResourceOffset
-             + dataBlockStart, metadataResourceLength));
-    }
-
-    return layout;
-}
-
-/* static */
-void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
-    const BinaryLayout &layout)
-{
-    content.d->m_magicMarker = layout.magicMarker;
-    content.d->m_metadataResourceSegments = layout.metadataResourceSegments;
-
-    const qint64 dataBlockStart = layout.endOfData - layout.dataBlockSize;
-    const qint64 operationsStart = layout.operationsStart + dataBlockStart;
-    if (!file->seek(operationsStart))
-        throw Error(QCoreApplication::translate("BinaryContent", "Could not seek to operation list."));
-
-    const qint64 operationsCount = QInstaller::retrieveInt64(file.data());
-    qDebug() << "Number of operations:" << operationsCount;
-
-    for (int i = 0; i < operationsCount; ++i) {
-        const QString name = QInstaller::retrieveString(file.data());
-        const QString data = QInstaller::retrieveString(file.data());
-        content.d->m_performedOperationsData.append(qMakePair(name, data));
-    }
-
-    // seek to the position of the component index
-    const qint64 resourceOffsetAndLengtSize = 2 * sizeof(qint64);
-    const qint64 resourceSectionSize = resourceOffsetAndLengtSize * layout.resourceCount;
-    const qint64 offset = layout.endOfData - layout.indexSize - resourceSectionSize
-        - resourceOffsetAndLengtSize;
-    if (!file->seek(offset)) {
-        throw Error(QCoreApplication::translate("BinaryContent",
-            "Could not seek to component index information."));
-    }
-    const qint64 compIndexStart = QInstaller::retrieveInt64(file.data()) + dataBlockStart;
-    if (!file->seek(compIndexStart))
-        throw Error(QCoreApplication::translate("BinaryContent", "Could not seek to component index."));
-
-    content.d->m_componentIndex = QInstallerCreator::ComponentIndex::read(file, dataBlockStart);
-    content.d->m_binaryFormatEngineHandler.setComponentIndex(content.d->m_componentIndex);
-
-    if (isVerbose()) {
-        const QVector<QInstallerCreator::Component> components = content.d->m_componentIndex.components();
-        qDebug() << "Number of components loaded:" << components.count();
-        foreach (const QInstallerCreator::Component &component, components) {
-            const QVector<QSharedPointer<QInstallerCreator::Archive> > archives = component.archives();
-            qDebug() << component.name().data() << "loaded...";
-            QStringList archivesWithSize;
-            foreach (const QSharedPointer<QInstallerCreator::Archive> &archive, archives) {
-                archivesWithSize.append(QString::fromLatin1("%1 - %2")
-                    .arg(QString::fromUtf8(archive->name()), humanReadableSize(archive->size())));
-            }
-            if (!archivesWithSize.isEmpty()) {
-                qDebug() << " - " << archives.count() << "archives: "
-                    << qPrintable(archivesWithSize.join(QLatin1String("; ")));
-            }
-        }
-    }
-}
-
-/*!
-    Registers already performed operations.
-*/
-int BinaryContent::registerPerformedOperations()
-{
-    if (d->m_performedOperations.count() > 0)
-        return d->m_performedOperations.count();
-
-    for (int i = 0; i < d->m_performedOperationsData.count(); ++ i) {
-        const QPair<QString, QString> opPair = d->m_performedOperationsData.at(i);
-        QScopedPointer<Operation> op(KDUpdater::UpdateOperationFactory::instance().create(opPair.first));
-        if (op.isNull()) {
-            qWarning() << QString::fromLatin1("Failed to load unknown operation %1").arg(opPair.first);
-            continue;
-        }
-
-        if (!op->fromXml(opPair.second)) {
-            qWarning() << "Failed to load XML for operation:" << opPair.first;
-            continue;
-        }
-        d->m_performedOperations.append(op.take());
-    }
-    return d->m_performedOperations.count();
-}
-
-/*!
-    Returns the operations performed during installation. Returns an empty list if no operations are
-    instantiated, performed or the binary is the installer application.
-*/
-OperationList BinaryContent::performedOperations() const
-{
-    return d->m_performedOperations;
-}
-
-/*!
-    Returns the magic marker found in the binary. Returns 0 if no marker has been found.
-*/
-qint64 BinaryContent::magicMarker() const
-{
-    return d->m_magicMarker;
-}
-
-/*!
-    Registers the Qt resources embedded in this binary.
- */
-int BinaryContent::registerEmbeddedQResources()
-{
-    if (d->m_resourceMappings.count() > 0)
-        return d->m_resourceMappings.count();
-
-    const bool hasBinaryDataFile = !d->m_binaryDataFile.isNull();
-    QFile *const data = hasBinaryDataFile ? d->m_binaryDataFile.data() : d->m_appBinary.data();
-    if (data != 0 && !data->isOpen() && !data->open(QIODevice::ReadOnly)) {
-        throw Error(QCoreApplication::translate("BinaryContent", "Could not open binary %1: %2")
-            .arg(data->fileName(), data->errorString()));
-    }
-
-    foreach (const Range<qint64> &i, d->m_metadataResourceSegments)
-        d->m_resourceMappings.append(addResourceFromBinary(data, i));
-
-    d->m_appBinary.clear();
-    if (hasBinaryDataFile)
-        d->m_binaryDataFile.clear();
-
-    return d->m_resourceMappings.count();
-}
-
-/*!
-    Registers the passed file as default resource content. If the embedded resources are already mapped into
-    memory, it will replace the first with the new content.
-*/
-void BinaryContent::registerAsDefaultQResource(const QString &path)
-{
-    QFile resource(path);
-    bool success = resource.open(QIODevice::ReadOnly);
-    if (success && (d->m_resourceMappings.count() > 0)) {
-        success = QResource::unregisterResource((const uchar*)d->m_resourceMappings.first().constData(),
-            QLatin1String(":/metadata"));
-        if (success)
-            d->m_resourceMappings.remove(0);
-    }
-
-    if (success) {
-        d->m_resourceMappings.prepend(addResourceFromBinary(&resource, Range<qint64>::fromStartAndEnd(0,
-            resource.size())));
-    } else {
-        qWarning() << QString::fromLatin1("Could not register '%1' as default resource.").arg(path);
-    }
-}
-
-/*!
-    Returns the binary component index as read from the file.
-*/
-QInstallerCreator::ComponentIndex BinaryContent::componentIndex() const
-{
-    return d->m_componentIndex;
-}
-
-} // namespace QInstaller
diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h
index 904912de8..565442248 100644
--- a/src/libs/installer/binaryformat.h
+++ b/src/libs/installer/binaryformat.h
@@ -42,13 +42,10 @@
 #ifndef BINARYFORMAT_H
 #define BINARYFORMAT_H
 
-#include "binaryformatenginehandler.h"
 #include "range.h"
 #include "qinstallerglobal.h"
 
 #include <QFile>
-#include <QHash>
-#include <QSharedPointer>
 #include <QVector>
 
 namespace QInstallerCreator {
@@ -129,86 +126,7 @@ public:
 private:
     QHash<QByteArray, Component> m_components;
 };
-}
 
-namespace QInstaller {
-
-static const qint64 MagicInstallerMarker = 0x12023233UL;
-static const qint64 MagicUninstallerMarker = 0x12023234UL;
-
-static const qint64 MagicUpdaterMarker = 0x12023235UL;
-static const qint64 MagicPackageManagerMarker = 0x12023236UL;
-
-// this cookie is put at the end of the file to determine whether we have data
-static const quint64 MagicCookie = 0xc2630a1c99d668f8LL;
-static const quint64 MagicCookieDat = 0xc2630a1c99d668f9LL;
-
-qint64 INSTALLER_EXPORT findMagicCookie(QFile *file, quint64 magicCookie = MagicCookie);
-
-struct BinaryLayout
-{
-    QVector<Range<qint64> > metadataResourceSegments;
-    qint64 operationsStart;
-    qint64 operationsEnd;
-    qint64 resourceCount;
-    qint64 dataBlockSize;
-    qint64 magicMarker;
-    quint64 magicCookie;
-    qint64 indexSize;
-    qint64 endOfData;
-};
-
-class INSTALLER_EXPORT BinaryContentPrivate : public QSharedData
-{
-public:
-    BinaryContentPrivate();
-    explicit BinaryContentPrivate(const QString &path);
-    BinaryContentPrivate(const BinaryContentPrivate &other);
-    ~BinaryContentPrivate();
-
-    qint64 m_magicMarker;
-    qint64 m_dataBlockStart;
-
-    QSharedPointer<QFile> m_appBinary;
-    QSharedPointer<QFile> m_binaryDataFile;
-
-    QList<Operation *> m_performedOperations;
-    QList<QPair<QString, QString> > m_performedOperationsData;
-
-    QVector<QByteArray> m_resourceMappings;
-    QVector<Range<qint64> > m_metadataResourceSegments;
-
-    QInstallerCreator::ComponentIndex m_componentIndex;
-    QInstallerCreator::BinaryFormatEngineHandler m_binaryFormatEngineHandler;
-};
-
-class INSTALLER_EXPORT BinaryContent
-{
-public:
-    BinaryContent();
-    BinaryContent(const BinaryContent &rhs);
-
-    static BinaryContent readFromBinary(const QString &path);
-    static BinaryContent readAndRegisterFromBinary(const QString &path);
-    static BinaryLayout readBinaryLayout(QFile *const file, qint64 cookiePos);
-
-    int registerPerformedOperations();
-    OperationList performedOperations() const;
-
-    qint64 magicMarker() const;
-    int registerEmbeddedQResources();
-    void registerAsDefaultQResource(const QString &path);
-    QInstallerCreator::ComponentIndex componentIndex() const;
-
-private:
-    explicit BinaryContent(const QString &path);
-    static void readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
-        const BinaryLayout &layout);
-
-private:
-    QSharedDataPointer<BinaryContentPrivate> d;
-};
-
-}
+} // namespace QInstallerCreator
 
 #endif // BINARYFORMAT_H
diff --git a/src/libs/installer/binaryformatengine.h b/src/libs/installer/binaryformatengine.h
index 3e9997fcb..b178402b9 100644
--- a/src/libs/installer/binaryformatengine.h
+++ b/src/libs/installer/binaryformatengine.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -44,6 +44,8 @@
 
 #include "binaryformat.h"
 
+#include <QtCore/private/qfsfileengine_p.h>
+
 namespace QInstallerCreator {
 
 class BinaryFormatEngine : public QAbstractFileEngine
diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp
index 238e73301..f28b71d3e 100644
--- a/src/libs/installer/createlocalrepositoryoperation.cpp
+++ b/src/libs/installer/createlocalrepositoryoperation.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -40,6 +40,7 @@
 **************************************************************************/
 #include "createlocalrepositoryoperation.h"
 
+#include "binarycontent.h"
 #include "binaryformat.h"
 #include "errors.h"
 #include "fileio.h"
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index fb2c5d014..ffe086053 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -117,7 +117,8 @@ HEADERS += packagemanagercore.h \
     remotefileengine.h \
     remoteserverconnection.h \
     remoteserverconnection_p.h \
-    fileio.h
+    fileio.h \
+    binarycontent.h
 
 SOURCES += packagemanagercore.cpp \
     packagemanagercore_p.cpp \
@@ -184,7 +185,8 @@ SOURCES += packagemanagercore.cpp \
     remoteserver.cpp \
     remotefileengine.cpp \
     remoteserverconnection.cpp \
-    fileio.cpp
+    fileio.cpp \
+    binarycontent.cpp
 
 RESOURCES += resources/patch_file_lists.qrc \
              resources/installer.qrc
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 5ae2c80ee..a7f10b89d 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -42,7 +42,7 @@
 #include "packagemanagercore_p.h"
 
 #include "adminauthorization.h"
-#include "binaryformat.h"
+#include "binarycontent.h"
 #include "component.h"
 #include "componentmodel.h"
 #include "downloadarchivesjob.h"
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 2bbf1c979..ae9fbc7bb 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -41,7 +41,8 @@
 #include "packagemanagercore_p.h"
 
 #include "adminauthorization.h"
-#include "binaryformat.h"
+#include "binarycontent.h"
+#include "binaryformatenginehandler.h"
 #include "component.h"
 #include "scriptengine.h"
 #include "componentmodel.h"
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 6a9198d5e..86508af53 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -45,7 +45,7 @@
 #include "tabcontroller.h"
 #include "updatechecker.h"
 
-#include <binaryformat.h>
+#include <binarycontent.h>
 #include <errors.h>
 #include <init.h>
 #include <messageboxhandler.h>
diff --git a/src/sdk/updatechecker.cpp b/src/sdk/updatechecker.cpp
index 29ef05fd1..f67de1dbd 100644
--- a/src/sdk/updatechecker.cpp
+++ b/src/sdk/updatechecker.cpp
@@ -42,7 +42,7 @@
 #include "updatechecker.h"
 #include "sdkapp.h"
 
-#include <binaryformat.h>
+#include <binarycontent.h>
 #include <component.h>
 #include <constants.h>
 #include <errors.h>
diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
index 217c373e3..b84e83f77 100644
--- a/tests/auto/installer/binaryformat/tst_binaryformat.cpp
+++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
@@ -39,7 +39,7 @@
 **
 **************************************************************************/
 
-#include <binaryformat.h>
+#include <binarycontent.h>
 #include <errors.h>
 #include <fileio.h>
 
diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
index 8a7af4a0b..f1306a10c 100644
--- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
+++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
@@ -39,7 +39,7 @@
 **
 **************************************************************************/
 
-#include <binaryformat.h>
+#include <binarycontent.h>
 #include <component.h>
 #include <errors.h>
 #include <fileutils.h>
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 3e8a651ef..96825bf49 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Installer Framework.
@@ -42,6 +42,7 @@
 
 #include <qtpatch.h>
 
+#include <binarycontent.h>
 #include <binaryformat.h>
 #include <errors.h>
 #include <fileio.h>
diff --git a/tools/devtool/binaryreplace.cpp b/tools/devtool/binaryreplace.cpp
index b4a797f0f..1e832dcfc 100644
--- a/tools/devtool/binaryreplace.cpp
+++ b/tools/devtool/binaryreplace.cpp
@@ -48,6 +48,7 @@
 #include <fileutils.h>
 #include <lib7z_facade.h>
 
+#include <QDir>
 #include <QFutureWatcher>
 
 #include <iostream>
diff --git a/tools/devtool/binaryreplace.h b/tools/devtool/binaryreplace.h
index 91bb5092b..52f90c209 100644
--- a/tools/devtool/binaryreplace.h
+++ b/tools/devtool/binaryreplace.h
@@ -42,7 +42,7 @@
 #ifndef BINARYREPLACE_H
 #define BINARYREPLACE_H
 
-#include <binaryformat.h>
+#include <binarycontent.h>
 
 class BinaryReplace
 {
diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp
index 213011ff1..713b0e02b 100644
--- a/tools/devtool/main.cpp
+++ b/tools/devtool/main.cpp
@@ -43,6 +43,7 @@
 #include "binaryreplace.h"
 #include "operationrunner.h"
 
+#include <binarycontent.h>
 #include <binaryformat.h>
 #include <binaryformatenginehandler.h>
 #include <errors.h>