diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-05-26 13:33:47 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-05-26 13:37:39 (GMT) |
| commit | 0ae04e9d7872d170974d15e8fbae8da1949c94df (patch) | |
| tree | 09256a162d9b0d8afde9e0829ec9a49b0a9da06b /src/corelib/global/qlibraryinfo.cpp | |
| parent | a670315152bf0914b8661b584d20752fd4da5b95 (diff) | |
| download | Qt-0ae04e9d7872d170974d15e8fbae8da1949c94df.zip Qt-0ae04e9d7872d170974d15e8fbae8da1949c94df.tar.gz Qt-0ae04e9d7872d170974d15e8fbae8da1949c94df.tar.bz2 | |
Mac: Prefix sat in qt.conf is ignored on Mac
Fix: Make sure to add the prefix to the value we return in QLibraryInfo
Task-number: 254545
Reviewed-by: Trenton Schulz
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 29e356e..7f6ff20 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -434,14 +434,14 @@ QLibraryInfo::location(LibraryLocation loc) #else if (QCoreApplication::instance()) { #ifdef Q_OS_MAC - CFBundleRef bundleRef = CFBundleGetMainBundle(); - if (bundleRef) { - QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); - if (urlRef) { - QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); - return QDir::cleanPath(path + QLatin1String("/Contents")); - } - } + CFBundleRef bundleRef = CFBundleGetMainBundle(); + if (bundleRef) { + QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); + if (urlRef) { + QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); + return QDir::cleanPath(path + QLatin1String("/Contents/") + ret); + } + } #endif return QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(ret); } else { |