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

Check '-I' directories for auto-detection of features

Browse Source 
This allows e.g. openssl/openssl.h to be auto-detected if the include
directory is passed via -I.

Change-Id: Ib1d08ab2b7f98b4c08b7d6b66d55a55796f6802d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Kai Koehne 2014-10-22 10:51:49 +02:00
parent f81e76da1e
commit 343d538727
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/configure/configureapp.cpp
View File

@ -2022,7 +2022,8 @@ QString Configure::locateFile(const QString &fileName) const
if (file.endsWith(".h")) {
static const QStringList headerPaths =
Environment::headerPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]));
pathList = headerPaths;
pathList = qmakeIncludes;
pathList += headerPaths;
} else if (file.endsWith(".lib") || file.endsWith(".a")) {
static const QStringList libPaths =
Environment::libraryPaths(Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]));