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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
This commit is contained in:
Eike Ziller
2012-07-24 14:17:33 +02:00
parent 3f6eed50c9 cebf6b9329
commit 42f4595e37
10 changed files with 1597 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: