From 9df78a2355f092d387bd6c97dc36ffd9fb0e9afa Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Thu, 19 Jun 2014 09:11:20 +0200
Subject: Fix Qt4 include paths.

Things like #include <QtCore/QObject> don't work anymore since the
latest refactoring.

Change-Id: Ic8cbc743c8799cfe92307667f1f7fff77bdd0b69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/lib/qtprofilesetup/qtprofilesetup.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/lib/qtprofilesetup/qtprofilesetup.cpp')

diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 09ecb1f02..2d34f69f5 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -200,10 +200,14 @@ static QString frameworkHeadersPath(const QtEnvironment &qtEnvironment, const Qt
 static QStringList qt4ModuleIncludePaths(const QtEnvironment &qtEnvironment,
         const QtModuleInfo &module)
 {
-    if (qtEnvironment.frameworkBuild && !module.isStaticLibrary)
-        return QStringList() << frameworkHeadersPath(qtEnvironment, module);
-    else
-        return QStringList() << qtEnvironment.includePath + QLatin1Char('/') + module.name;
+    QStringList paths;
+    if (qtEnvironment.frameworkBuild && !module.isStaticLibrary) {
+        paths << frameworkHeadersPath(qtEnvironment, module);
+    } else {
+        paths << qtEnvironment.includePath
+              << qtEnvironment.includePath + QLatin1Char('/') + module.name;
+    }
+    return paths;
 }
 
 static void createModules(Profile &profile, Settings *settings,
-- 
cgit v1.2.3