diff options
Diffstat (limited to 'qmake/qmakelibraryinfo.cpp')
| -rw-r--r-- | qmake/qmakelibraryinfo.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp index 45c74c25ad9..5b811068597 100644 --- a/qmake/qmakelibraryinfo.cpp +++ b/qmake/qmakelibraryinfo.cpp @@ -169,17 +169,22 @@ static QLibraryInfoPrivate::LocationInfo defaultLocationInfo(int loc) return result; } +static QString libraryInfoPath(QLibraryInfo::LibraryPath location) +{ + return QLibraryInfoPrivate::path(location, QLibraryInfoPrivate::UsedFromQtBinDir); +} + static QString storedPath(int loc) { QString result; if (loc < QMakeLibraryInfo::FirstHostPath) { - result = QLibraryInfo::path(static_cast<QLibraryInfo::LibraryPath>(loc)); + result = libraryInfoPath(static_cast<QLibraryInfo::LibraryPath>(loc)); } else if (loc <= QMakeLibraryInfo::LastHostPath) { if (loc == QMakeLibraryInfo::HostDataPath) { // Handle QT_HOST_DATADIR specially. It is not necessarily equal to QT_INSTALL_DATA. result = QT_HOST_DATADIR; } else { - result = QLibraryInfo::path(hostToTargetPathEnum(loc)); + result = libraryInfoPath(hostToTargetPathEnum(loc)); } } else if (loc == QMakeLibraryInfo::SysrootPath) { // empty result |