Merge remote-tracking branch 'origin/2.6'

Conflicts: qtcreator.qbp src/plugins/qtsupport/baseqtversion.cpp src/tools/tools.pro Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
parent 996122b7e9 471f44aae3
commit a55d47544a
145 changed files with 4530 additions and 534 deletions
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -213,7 +213,9 @@ QtcLibrary {
    }

    ProductModule {
+        Depends { name: "cpp" }
        Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
+        cpp.includePaths: [".."]
    }
 }