Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 63c1e8a1f0..11064a757d 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();