diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-20 16:27:55 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 16:39:43 +0200 |
| commit | 86a6ffbc3e991c62ec9306f63a1d1d6721e2977e (patch) | |
| tree | 57bb26e4fc69644e4ad2955ae2e0ab7dff73a379 /src/corelib/global/qlibraryinfo.cpp | |
| parent | 119da2c8d49a1eadd8561b5c7fe04b251d34c96d (diff) | |
make relative paths in qt.conf work inside qmake
Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -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 aca1cb1db6..180eadfdfc 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -453,7 +453,7 @@ QLibraryInfo::location(LibraryLocation loc) if (loc == PrefixPath) { // we make the prefix path absolute to the executable's directory #ifdef BOOTSTRAPPING - return QFileInfo(qmake_libraryInfoFile()).absolutePath(); + return QDir(QFileInfo(qmake_libraryInfoFile()).absolutePath()).absoluteFilePath(ret); #else if (QCoreApplication::instance()) { #ifdef Q_OS_MAC |