Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts: src/plugins/analyzerbase/analyzerbase.qbs src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qt4projectmanager/qt4projectmanager.qbs Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
2013-05-28 18:28:00 +02:00
parent 60378b43bf 24e81241a5
commit 8d894aee02
43 changed files with 4350 additions and 1597 deletions
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -11,7 +11,6 @@ QtcLibrary {
    ])
    cpp.optimization: "fast"

-    Depends { name: "cpp" }
    Depends { name: "Qt.widgets" }

    Group {
@@ -169,7 +168,6 @@ QtcLibrary {
    ]

    Export {
-        Depends { name: "cpp" }
        cpp.includePaths: [
            "../3rdparty"
        ]