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/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
    Depends { name: "Locator" }
    Depends { name: "app_version_header" }

-    Depends { name: "cpp" }

    cpp.defines: {
        var list = base;