diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-22 10:51:49 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-23 17:12:44 +0200 |
| commit | 343d538727ccff3bea625ffc8068f4aeae60c751 (patch) | |
| tree | 96f3921136ec136e0ba1d1589468c3573e8ac509 | |
| parent | f81e76da1e8520866616c2fe9e46547b9201f202 (diff) | |
Check '-I' directories for auto-detection of features
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>
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 99ecc7b2de..92422c2829 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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")])); |