diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
| commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
| tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /src/corelib/global/qlibraryinfo.cpp | |
| parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
| parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -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 9bc7506e39..a279498e93 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -446,7 +446,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 |