Merge remote-tracking branch 'origin/3.1'

2014-04-14 16:53:23 +02:00
parent 7bce07f192 e6f868572d
commit 8c1c106a4f
92 changed files with 38015 additions and 40668 deletions
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -306,6 +306,8 @@ void CppToolsPlugin::test_completion()
    expectedCompletions.sort();

    QEXPECT_FAIL("enum_in_function_in_struct_in_function", "doesn't work", Abort);
+    QEXPECT_FAIL("nested_class_in_template_class_QTCREATORBUG-11752",
+                 "related to infiniteLoopLocalTypedef_QTCREATORBUG-11999", Abort);
    QCOMPARE(actualCompletions, expectedCompletions);
 }