Merge remote-tracking branch 'origin/1.10'

Conflicts:
	src/lib/qtprofilesetup/qtprofilesetup.cpp
	src/lib/qtprofilesetup/templates/QtModule.qbs
	src/lib/qtprofilesetup/templates/core.qbs

Change-Id: I342608a47f1a90b53eb12cc14fc3ff116063d15f

1 files changed, 6 insertions, 6 deletions

diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 6f2962257..e93f00d0e 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -725,12 +725,6 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) {
             args.push('-fvisibility=default')
     }
 
-    var prefixHeaders = input.cpp.prefixHeaders;
-    for (i in prefixHeaders) {
-        args.push('-include');
-        args.push(prefixHeaders[i]);
-    }
-
     if (compilerInfo.language)
         // Only push language arguments if we have to.
         Array.prototype.push.apply(args, compilerInfo.language);
@@ -751,6 +745,12 @@ function compilerFlags(project, product, input, output, explicitlyDependsOn) {
         args.push('-include', pchFilePath);
     }
 
+    var prefixHeaders = input.cpp.prefixHeaders;
+    for (i in prefixHeaders) {
+        args.push('-include');
+        args.push(prefixHeaders[i]);
+    }
+
     var positionIndependentCode = input.cpp.positionIndependentCode;
     if (positionIndependentCode && !product.qbs.toolchain.contains("mingw"))
         args.push('-fPIC');