summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcompletion_test.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-04-14 16:53:23 +0200
committerEike Ziller <eike.ziller@digia.com>2014-04-14 16:53:23 +0200
commit8c1c106a4ff3df961d941cf612b29abeb69d4580 (patch)
tree25dfde210225f469e296ad88c05611d366fbebe1 /src/plugins/cpptools/cppcompletion_test.cpp
parent7bce07f192d2fc8a80eace37c08db48aa4e82cd5 (diff)
parente6f868572d055a1b95d6ec564d2572aa127fd096 (diff)
downloadqt-creator-8c1c106a4ff3df961d941cf612b29abeb69d4580.tar.gz
Merge remote-tracking branch 'origin/3.1'
Diffstat (limited to 'src/plugins/cpptools/cppcompletion_test.cpp')
-rw-r--r--src/plugins/cpptools/cppcompletion_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 878bcf78be..1169ab7714 100644
--- 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);
}