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_dependencies.pri
+++ b/src/plugins/cpptools/cpptools_dependencies.pri
@@ -7,3 +7,6 @@ QTC_PLUGIN_DEPENDS += \
    coreplugin \
    projectexplorer \
    texteditor
+QTC_TEST_DEPENDS += \
+    cppeditor \
+    qmakeprojectmanager