diff options
| author | Eike Ziller <[email protected]> | 2013-04-11 18:27:52 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-04-11 18:27:52 +0200 |
| commit | 9ff8979da32642e60029cb7cf8536eed6442c270 (patch) | |
| tree | 4c1bb2288209c4c9b65408d7ec104747b278cd43 /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | e6eb061293a63bf52fb34dc39016d0fa8bbbe12b (diff) | |
| parent | 567098f210a7f73b98f02132a545bd5b5420e5a4 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/cpptools/cppchecksymbols.h
src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp
Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 179fa417623..4e6ead7b0a9 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -122,6 +122,7 @@ private slots: void test_completion_template_specialization_with_pointer(); void test_completion_typedef_using_templates1(); void test_completion_typedef_using_templates2(); + void test_completion_namespace_alias_with_many_namespace_declarations(); void test_format_pointerdeclaration_in_simpledeclarations(); void test_format_pointerdeclaration_in_simpledeclarations_data(); |