diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
| commit | 42f4595e37fc859582e0bb0f332d50bd80e22973 (patch) | |
| tree | 008bf32443019517e2875ed79057be24a2f36fca /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | 3f6eed50c90f28be543af439a0e2a8719d372b09 (diff) | |
| parent | cebf6b9329deeab410e09f09a17b9a611a40282d (diff) | |
| download | qt-creator-42f4595e37fc859582e0bb0f332d50bd80e22973.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/libs/cplusplus/cplusplus-lib.pri
Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 9d975ac649..1c89af6fd3 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -89,6 +89,9 @@ private slots: void test_codegen_definition_first_member(); void test_codegen_definition_last_member(); void test_codegen_definition_middle_member(); + + void test_completion_basic_1(); + void test_completion_template_1(); #endif private: |