diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-07-03 11:36:37 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-07-04 14:41:21 +0200 |
| commit | 7f4fadd08d88262f357671cb8c039253c6e65326 (patch) | |
| tree | 16b5128e609771d78fd1ab7673b0bbd72904afae /tools | |
| parent | d847723173a5cd2bb2eb27ff0eb45ae323c8070a (diff) | |
Workaround for QFileInfo::isBundle().
For some reason the former code did not work anyore as expected,
the issue seems to be in QFileInfo::isBundle or how we used it.
To not depend on a possible fix in Qt, we now always resolve the
path before we ask QFileInfo if it is a bundle.
Fixes also the behavior change introduced in cead4555. On OSX,
we get the .dat file passed that's inside the bundle, still we
need to read the data from a .dat file that's located beside
the app bundle...
Change-Id: Idaa7adc6fbad6bd8e9ce90c383b34ea51fe40e8f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 84f5dfa42..3e8a651ef 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -117,7 +117,7 @@ static void chmod755(const QString &absolutFilePath) static int assemble(Input input, const QInstaller::Settings &settings) { #ifdef Q_OS_OSX - if (QFileInfo(input.installerExePath).isBundle()) { + if (QInstaller::isInBundle(input.installerExePath)) { const QString bundle = input.installerExePath; // if the input file was a bundle const QSettings s(QString::fromLatin1("%1/Contents/Info.plist").arg(input.installerExePath), |