AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make relative paths in qt.conf work inside qmake

Browse Source 
Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
This commit is contained in:
Oswald Buddenhagen 2011-04-20 16:27:55 +02:00 committed by Olivier Goffart
parent 119da2c8d4
commit 86a6ffbc3e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qlibraryinfo.cpp
View File

@ -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