diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-22 11:17:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-22 11:17:09 +0200 |
| commit | 021b64b5dfb8776b847d0faffb0619d4d64be112 (patch) | |
| tree | 1d645c544fc1b960ee7f75b01666a64b4d10bfec /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | 68a7861263cb137038a12d692a264647b404756b (diff) | |
| parent | fbf6a8da757d42b0d4b8126400f4c66dafc6bd95 (diff) | |
| download | qt-creator-021b64b5dfb8776b847d0faffb0619d4d64be112.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index af90948bf6..3acba5359b 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -74,7 +74,6 @@ public: private slots: void switchHeaderSource(); - #ifdef WITH_TESTS // codegen tests @@ -95,6 +94,8 @@ private slots: void test_completion_template_1(); void test_completion_template_2(); void test_completion_template_3(); + void test_completion_template_4(); + void test_completion_template_5(); void test_completion_template_as_base(); void test_completion_template_as_base_data(); void test_completion_use_global_identifier_as_base_class(); |