diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-14 09:44:24 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-14 09:45:48 (GMT) |
| commit | 0eb365bca2dc3b7244b3c9adec65a17cd36123be (patch) | |
| tree | fc5021b8edcbde6758c86a4071a304954121b54e /tools | |
| parent | af619623dd14055b8d37a49f48b14a33dc7ae048 (diff) | |
| download | Qt-0eb365bca2dc3b7244b3c9adec65a17cd36123be.zip Qt-0eb365bca2dc3b7244b3c9adec65a17cd36123be.tar.gz Qt-0eb365bca2dc3b7244b3c9adec65a17cd36123be.tar.bz2 | |
fix for mingw to still look into LIB and INCLUDE env var
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ccb2665..985c317 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1688,14 +1688,13 @@ bool Configure::findFile( const QString &fileName ) QString paths; if (file.endsWith(".h")) { - if (!mingwPath.isNull()) - paths = mingwPath + QLatin1String("/../include"); - else - paths = QString::fromLocal8Bit(getenv("INCLUDE")); - } else if ( file.endsWith( ".lib" ) ) { + if (!mingwPath.isNull() && !findFileInPaths(file, mingwPath + QLatin1String("/../include")).isNull()) + return true; + paths = QString::fromLocal8Bit(getenv("INCLUDE")); + } else if ( file.endsWith( ".lib" ) || file.endsWith( ".a" ) ) { + if (!mingwPath.isNull() && !findFileInPaths(file, mingwPath + QLatin1String("/../lib")).isNull()) + return true; paths = QString::fromLocal8Bit(getenv("LIB")); - } else if (file.endsWith( ".a" ) && !mingwPath.isNull() ) { - paths = mingwPath + QLatin1String("/../lib"); } else { paths = pathEnvVar; } |