feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Fix broken merge of 9121c21230.

Browse Source 
Change-Id: I0cca1851132245430d59840728362ddea1475655
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Christian Kamm
2012-07-19 14:25:37 +02:00
parent 23777da0e8
commit 8dc0f69ed1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cpptools/cpptools.pro
View File

@@ -90,5 +90,6 @@ FORMS += completionsettingspage.ui \
equals(TEST, 1) { equals(TEST, 1) {
SOURCES += \ SOURCES += \
cppcodegen_test.cpp cppcodegen_test.cpp \
cppcompletion_test.cpp
} }

3
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -90,6 +90,9 @@ private slots:
void test_codegen_definition_first_member(); void test_codegen_definition_first_member();
void test_codegen_definition_last_member(); void test_codegen_definition_last_member();
void test_codegen_definition_middle_member(); void test_codegen_definition_middle_member();
void test_completion_basic_1();
void test_completion_template_1();
#endif #endif
private: private: