diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 05:56:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-04 05:56:06 +0000 |
| commit | ccad00121d0a9d703cf715c54347b32bfc33bbfc (patch) | |
| tree | 8e492f00f9ea81d87ae9126ad06c3dbc21fee3a3 /tools/configure/environment.cpp | |
| parent | dc2617f35be61b4827b8e3d192c85e2feacf7f6a (diff) | |
| parent | e2f66f921594b7be4af4a058c959557489e86879 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'tools/configure/environment.cpp')
| -rw-r--r-- | tools/configure/environment.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 63c1e8a1f0b..11064a757dd 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -611,9 +611,9 @@ QStringList Environment::headerPaths(Compiler compiler) foreach (const QFileInfo &version, mingwLibDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) headerPaths += version.absoluteFilePath() + QLatin1String("/include"); } + } else { + headerPaths = splitPathList(QString::fromLocal8Bit(getenv("INCLUDE"))); } - // MinGW: Although gcc doesn't care about INCLUDE, qmake automatically adds it via -I - headerPaths += splitPathList(QString::fromLocal8Bit(getenv("INCLUDE"))); // Add Direct X SDK for ANGLE const QString directXSdk = detectDirectXSdk(); @@ -627,9 +627,9 @@ QStringList Environment::libraryPaths(Compiler compiler) QStringList libraryPaths; if (compiler == CC_MINGW) { libraryPaths = mingwPaths(detectMinGW(), "lib"); + } else { + libraryPaths = splitPathList(QString::fromLocal8Bit(qgetenv("LIB"))); } - // MinGW: Although gcc doesn't care about LIB, qmake automatically adds it via -L - libraryPaths += splitPathList(QString::fromLocal8Bit(qgetenv("LIB"))); // Add Direct X SDK for ANGLE const QString directXSdk = detectDirectXSdk(); |