1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

less preprocessor magic relating to qmake build

Browse Source 
it's not worth making things more complicated to remove the duplication of
one real LOC.

Change-Id: Iddbd0db7d0f81b80192b3980dbe2316b246a3b57
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-12-03 17:43:21 +01:00
parent afd40dd123
commit f1836ecaf7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,9 +396,6 @@ QLibraryInfo::location(LibraryLocation loc)
QString QString
QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
{ {
#else
# define rawLocation(loca, group) location(loca)
# define group dummy
#endif #endif
QString ret; QString ret;
#ifdef QT_BUILD_QMAKE #ifdef QT_BUILD_QMAKE
@ -494,6 +491,9 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
} else if (loc > SysrootPath && loc <= LastHostPath) { } else if (loc > SysrootPath && loc <= LastHostPath) {
// We make any other host path absolute to the host prefix directory. // We make any other host path absolute to the host prefix directory.
baseDir = rawLocation(HostPrefixPath, group); baseDir = rawLocation(HostPrefixPath, group);
} else {
// we make any other path absolute to the prefix directory
baseDir = rawLocation(PrefixPath, group);
#else #else
if (loc == PrefixPath) { if (loc == PrefixPath) {
if (QCoreApplication::instance()) { if (QCoreApplication::instance()) {
@ -518,10 +518,10 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
} else { } else {
baseDir = QDir::currentPath(); baseDir = QDir::currentPath();
} }
#endif
} else { } else {
// we make any other path absolute to the prefix directory // we make any other path absolute to the prefix directory
baseDir = rawLocation(PrefixPath, group); baseDir = location(PrefixPath);
#endif
} }
ret = QDir::cleanPath(baseDir + QLatin1Char('/') + ret); ret = QDir::cleanPath(baseDir + QLatin1Char('/') + ret);
} }