summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/binaryformat.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@digia.com>2013-08-23 15:07:08 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-08-23 15:41:50 +0200
commit1e8df3546b9550b3161fd5a3e23c2271689a1ec1 (patch)
tree99bdd4e292400622f9c86e85cfe6cd322ad1f42b /src/libs/installer/binaryformat.cpp
parent361af37d6ccd05c7d55da505e0c59e2b9d04113e (diff)
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 <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/binaryformat.cpp')
-rw-r--r--src/libs/installer/binaryformat.cpp8
1 files changed, 8 insertions, 0 deletions
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
}
/*!