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

configure: take XQMAKESPEC into account when looking for files.

Browse Source 
When cross-compiling, locateFile() needs to look into the XQMAKESPEC
directories instead. Otherwise, this will cause checkAvailability()/findFile()
to report wrong results.

Change-Id: Ia1b566b70cff039d8fd540bde3c7b4707338348a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Rafael Roquetto 2015-03-10 10:25:57 -03:00 committed by Rafael Roquetto
parent 6a15f68574
commit f9da2c2c36
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configure/configureapp.cpp
View File

@ -2037,16 +2037,18 @@ bool Configure::displayHelp()
// Locate a file and return its containing directory. // Locate a file and return its containing directory.
QString Configure::locateFile(const QString &fileName) const QString Configure::locateFile(const QString &fileName) const
{ {
const QString mkspec = dictionary.contains(QStringLiteral("XQMAKESPEC"))
? dictionary[QStringLiteral("XQMAKESPEC")] : dictionary[QStringLiteral("QMAKESPEC")];
const QString file = fileName.toLower(); const QString file = fileName.toLower();
QStringList pathList; QStringList pathList;
if (file.endsWith(".h")) { if (file.endsWith(".h")) {
static const QStringList headerPaths = static const QStringList headerPaths =
Environment::headerPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")])); Environment::headerPaths(Environment::compilerFromQMakeSpec(mkspec));
pathList = qmakeIncludes; pathList = qmakeIncludes;
pathList += headerPaths; pathList += headerPaths;
} else if (file.endsWith(".lib") || file.endsWith(".a")) { } else if (file.endsWith(".lib") || file.endsWith(".a")) {
static const QStringList libPaths = static const QStringList libPaths =
Environment::libraryPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")])); Environment::libraryPaths(Environment::compilerFromQMakeSpec(mkspec));
pathList = libPaths; pathList = libPaths;
} else { } else {
// Fallback for .exe and .dll (latter are not covered by QStandardPaths). // Fallback for .exe and .dll (latter are not covered by QStandardPaths).