summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-08-26 10:36:16 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-08-26 10:36:16 +0200
commitd1334fb478c61a3a63e2f2ec334c1f5487804d74 (patch)
tree77ea29cc9964cded4d53105e71f88f8733b7f2ea
parent90bacf8841f53f57296e52e26d3c82378cfa91db (diff)
parent1e8df3546b9550b3161fd5a3e23c2271689a1ec1 (diff)
Merge remote-tracking branch 'origin/1.3' into 1.4
-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 c6562f333..1d257a1b4 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
}
/*!