summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolsplugin.h
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-18 10:25:52 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-18 14:07:00 +0200
commite58906a9ed718b0e65a0f805c165e7bacf54d936 (patch)
tree7b90dd84042d7452020cf8f7433b4c758f264f6e /src/plugins/cpptools/cpptoolsplugin.h
parentc4c9b90b7f32b6b04026079ba5953bcf9730f562 (diff)
downloadqt-creator-e58906a9ed718b0e65a0f805c165e7bacf54d936.tar.gz
C++: Limit typedef resolving depth
This reverts commit 5be56c0 except for its tests. While it fixed the problem described in the bug report, it also introduced regressions. For now, we use a hard limit. Change-Id: I19a85be454e3d7969371707e3eb1c3d42a16ecee Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 2c30baf90f..d9633708dc 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -153,6 +153,8 @@ private slots:
void test_completion_recursive_using_declarations1();
void test_completion_recursive_using_declarations2();
void test_completion_recursive_using_typedef_declarations();
+ void test_completion_recursive_typedefs_in_templates1();
+ void test_completion_recursive_typedefs_in_templates2();
void test_completion_prefix_first_QTCREATORBUG_8737();
void test_completion_prefix_first_QTCREATORBUG_9236();
@@ -184,9 +186,6 @@ private slots:
void test_completion_local_type_and_member_5();
void test_completion_local_type_and_member_6();
- void test_completion_recursive_typedefs_in_templates1();
- void test_completion_recursive_typedefs_in_templates2();
-
void test_completion_signals_hide_QPrivateSignal();
void test_format_pointerdeclaration_in_simpledeclarations();