diff options
| author | Eike Ziller <[email protected]> | 2013-07-03 16:55:27 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-07-03 16:55:27 +0200 |
| commit | 8685ff8a28d54938f8178966954f7e36b2d15a20 (patch) | |
| tree | 2e05c46e4ae061f76aa6ab1ed85f5d6ad2269652 /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | 99647b89e57e3d2ba48d26b8ae6f607d56b91477 (diff) | |
| parent | b05603a44d67d1cfa080a16ae774485d26152f4f (diff) | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 63fa279550e..7a5f2878bfc 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -171,6 +171,8 @@ private slots: void test_modelmanager_framework_headers(); void test_modelmanager_refresh_1(); void test_modelmanager_refresh_2(); + void test_modelmanager_snapshot_after_two_projects(); + void test_modelmanager_extraeditorsupport_uiFiles(); private: void test_completion(); |