diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2012-07-19 14:25:37 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2012-07-23 07:19:26 +0200 |
| commit | 8dc0f69ed10aace2c099b6758b4c703723790464 (patch) | |
| tree | b2944dc09a47f99d7af5bd88f52641741dc99823 | |
| parent | 23777da0e8c8c40d6671eb8f528d9f392429c988 (diff) | |
| download | qt-creator-8dc0f69ed10aace2c099b6758b4c703723790464.tar.gz | |
C++: Fix broken merge of 9121c21230829b3897188c849c0247b8c67b8da5.
Change-Id: I0cca1851132245430d59840728362ddea1475655
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
| -rw-r--r-- | src/plugins/cpptools/cpptools.pro | 3 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index c53c6e8a71..744eead027 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -90,5 +90,6 @@ FORMS += completionsettingspage.ui \ equals(TEST, 1) { SOURCES += \ - cppcodegen_test.cpp + cppcodegen_test.cpp \ + cppcompletion_test.cpp } diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 51319ffc96..97875e5a32 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -90,6 +90,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: |