diff options
| author | aavit <qt-info@nokia.com> | 2010-02-22 11:33:53 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-22 11:33:53 (GMT) |
| commit | fae5e14b5ac5fed5922e5193d0f40c29bd1e0289 (patch) | |
| tree | e0146f7fa15d02aca99dd90ccc0337aefafaf311 | |
| parent | 460394f8f225cc60e5dc1ad9804a6c8dd078fc05 (diff) | |
| parent | b9db89f7d299305769e207088a00345dbe82cf1d (diff) | |
| download | Qt-fae5e14b5ac5fed5922e5193d0f40c29bd1e0289.zip Qt-fae5e14b5ac5fed5922e5193d0f40c29bd1e0289.tar.gz Qt-fae5e14b5ac5fed5922e5193d0f40c29bd1e0289.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a9ea44a..d5041c9 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -439,7 +439,7 @@ QLibraryInfo::location(LibraryLocation loc) QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); if (urlRef) { QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle); - return QDir::cleanPath(path + QLatin1String("/Contents/") + ret); + return QDir::cleanPath(QString(path) + QLatin1String("/Contents/") + ret); } } #endif |