From 7f4fadd08d88262f357671cb8c039253c6e65326 Mon Sep 17 00:00:00 2001 From: kh1 Date: Thu, 3 Jul 2014 11:36:37 +0200 Subject: 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 --- src/libs/installer/fileutils.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libs/installer/fileutils.h') diff --git a/src/libs/installer/fileutils.h b/src/libs/installer/fileutils.h index a8efefacd..077ab218b 100644 --- a/src/libs/installer/fileutils.h +++ b/src/libs/installer/fileutils.h @@ -105,6 +105,7 @@ private: void INSTALLER_EXPORT mkpath(const QString &path); quint64 INSTALLER_EXPORT fileSize(const QFileInfo &info); + bool INSTALLER_EXPORT isInBundle(const QString &path, QString *bundlePath = 0); #ifdef Q_OS_WIN QString INSTALLER_EXPORT getLongPathName(const QString &name); -- cgit v1.2.3