From 86a6ffbc3e991c62ec9306f63a1d1d6721e2977e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 20 Apr 2011 16:27:55 +0200
Subject: make relative paths in qt.conf work inside qmake

Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
---
 src/corelib/global/qlibraryinfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/global/qlibraryinfo.cpp')

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
-- 
cgit v1.2.3