summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 88930cd6c7..04909525d1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2037,16 +2037,18 @@ bool Configure::displayHelp()
// Locate a file and return its containing directory.
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();
QStringList pathList;
if (file.endsWith(".h")) {
static const QStringList headerPaths =
- Environment::headerPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]));
+ Environment::headerPaths(Environment::compilerFromQMakeSpec(mkspec));
pathList = qmakeIncludes;
pathList += headerPaths;
} else if (file.endsWith(".lib") || file.endsWith(".a")) {
static const QStringList libPaths =
- Environment::libraryPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]));
+ Environment::libraryPaths(Environment::compilerFromQMakeSpec(mkspec));
pathList = libPaths;
} else {
// Fallback for .exe and .dll (latter are not covered by QStandardPaths).