diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-19 12:34:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-19 12:34:58 +0200 |
| commit | c4e51e7405200272fd349dc18d16f911bdc34f06 (patch) | |
| tree | 82978d02a8bb4f15dbe662947cd2c1387740ca43 /src/plugins/cppeditor/cppeditorplugin.h | |
| parent | c5fae0e8dac0a5a5466d8cc3bb0bc81ce2d625b8 (diff) | |
| parent | 507ad11f945b0320fcbce7cac465f0226ba73199 (diff) | |
| download | qt-creator-c4e51e7405200272fd349dc18d16f911bdc34f06.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667
Diffstat (limited to 'src/plugins/cppeditor/cppeditorplugin.h')
| -rw-r--r-- | src/plugins/cppeditor/cppeditorplugin.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h index 2e0be1c4a2..42ddafc1d3 100644 --- a/src/plugins/cppeditor/cppeditorplugin.h +++ b/src/plugins/cppeditor/cppeditorplugin.h @@ -201,13 +201,14 @@ private slots: void test_quickfix_ExtractLiteralAsParameter_typeDeduction(); void test_quickfix_ExtractLiteralAsParameter_freeFunction_separateFiles(); void test_quickfix_ExtractLiteralAsParameter_memberFunction_separateFiles(); + void test_quickfix_ExtractLiteralAsParameter_notTriggeringForInvalidCode(); void test_quickfix_InsertVirtualMethods_data(); void test_quickfix_InsertVirtualMethods(); void test_quickfix_InsertVirtualMethods_implementationFile(); void test_quickfix_InsertVirtualMethods_BaseClassInNamespace(); - // tests for "Include Hiererchy" + // tests for "Include Hierarchy" void test_includehierarchy_data(); void test_includehierarchy(); |