diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-24 16:20:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-24 16:20:10 +0200 |
| commit | d8bd56bcd69dbe484745d2d7b9c5057a50f79d3e (patch) | |
| tree | 38449b739cc5562da083cbd7d1d8dff1d3042e39 /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | 8b61a5da2ed70a668b7e85466164bdc233028d11 (diff) | |
| parent | 80e1ae805982c8dd9b34903accb9ed3449337a63 (diff) | |
| download | qt-creator-d8bd56bcd69dbe484745d2d7b9c5057a50f79d3e.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
src/plugins/qbsprojectmanager/qbscleanstep.cpp
src/plugins/qbsprojectmanager/qbsnodes.cpp
src/shared/qbs
Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 5e4d143850..10f033c043 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -137,6 +137,7 @@ private slots: void test_completion_type_and_using_declaration_data(); void test_completion_instantiate_template_with_anonymous_class(); void test_completion_instantiate_template_function(); + void test_completion_crash_cloning_template_class_QTCREATORBUG9329(); void test_format_pointerdeclaration_in_simpledeclarations(); void test_format_pointerdeclaration_in_simpledeclarations_data(); |