From 1e8df3546b9550b3161fd5a3e23c2271689a1ec1 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 23 Aug 2013 15:07:08 +0200 Subject: Fixes QTIFW-322, missing magic cookie in installer binary * on mac magic cookie is kept in install.dat and not in installer binary itself Change-Id: I568bbdf7a0bcf3b6efeda0bdfe2141e15c6c73aa Reviewed-by: Tim Jenssen --- src/libs/installer/binaryformat.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/libs') diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp index c5168dcb8..61429b019 100644 --- a/src/libs/installer/binaryformat.cpp +++ b/src/libs/installer/binaryformat.cpp @@ -853,7 +853,15 @@ BinaryContent BinaryContent::readAndRegisterFromBinary(const QString &path) */ BinaryContent BinaryContent::readFromApplicationFile() { +#ifdef Q_OS_MAC + // On Mac, data is always in a separate file so that the binary can be signed + QDir dataPath(QCoreApplication::applicationFilePath()); + dataPath.cdUp(); + dataPath.cd(QLatin1String("Resources")); + return BinaryContent::readFromBinary(dataPath.filePath(QLatin1String("installer.dat"))); +#else return BinaryContent::readFromBinary(QCoreApplication::applicationFilePath()); +#endif } /*! -- cgit v1.2.3