Merge remote-tracking branch 'origin/2.5'

Conflicts: qtcreator.pri src/libs/utils/utils.qbs src/plugins/projectexplorer/miniprojecttargetselector.cpp src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qmljsinspector/qmljsinspector.qbs Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
parent c863662bb2 ca516cf31d
commit 822233629d
99 changed files with 2757 additions and 371 deletions
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -173,6 +173,7 @@ QtcLibrary {
    ]

    ProductModule {
+        Depends { name: "cpp" }
        cpp.includePaths: [
            ".",
            "../3rdparty",