Merge remote-tracking branch 'origin/2.7'

Conflicts: src/plugins/cpptools/cppchecksymbols.h src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
parent e6eb061293 567098f210
commit 9ff8979da3
64 changed files with 961 additions and 304 deletions
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -283,6 +283,7 @@ struct CanonicalSymbol
        : editor(editor), info(info)
    {
        typeOfExpression.init(info.doc, info.snapshot);
+        typeOfExpression.setExpandTemplates(true);
    }

    const LookupContext &context() const