diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-10-10 13:34:42 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 12:34:14 +0200 |
commit | c1417023d502200ef2b68cf46d72e6496d787020 (patch) | |
tree | 4aff654186630f651d7fa4b53e648f98b8b97b9f | |
parent | b8da27bc909ccef51269a59233d2b943e9acb220 (diff) |
Correct PrefixPath on iOS.
The iOS bundles are "flat", do not insert "/Contents/"
like we do on OS X.
Change-Id: I4e848f4425482b92cac04d940e5bce06b7199fc6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 8d681f0c4c..33d7b71cff 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -442,7 +442,11 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); if (urlRef) { QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); +#ifdef Q_OS_MACX return QDir::cleanPath(QString(path) + QLatin1String("/Contents/") + ret); +#else + return QDir::cleanPath(QString(path) + QLatin1Char('/') + ret); // iOS +#endif } } #endif |