diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-20 14:27:55 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-06 09:35:22 (GMT) |
| commit | e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e (patch) | |
| tree | 3ae8b1b7803770271730994c20aa39b6bb5e6e2d /src/corelib | |
| parent | d03a28a289cf0665290e6ea0375b31cbb2d6649e (diff) | |
| download | Qt-e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e.zip Qt-e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e.tar.gz Qt-e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e.tar.bz2 | |
make relative paths in qt.conf work inside qmake
Task-number: QTBUG-11602
Reviewed-by: joerg
Diffstat (limited to 'src/corelib')
| -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 1fecc26..e69e0a6 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 |