Merge remote-tracking branch 'origin/3.4'

2015-03-24 07:40:21 +01:00
parent 674b798350 044eeacde5
commit 9790d8aa00
103 changed files with 1018 additions and 1167 deletions
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -13,6 +13,11 @@ QtcPlugin {
    Depends { name: "ProjectExplorer" }
    Depends { name: "app_version_header" }

+    pluginTestDepends: [
+        "CppEditor",
+        "QmakeProjectManager",
+    ]
+
    cpp.defines: base
    Properties {
        condition: qbs.toolchain.contains("msvc")