Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 62204fac96a..09028beb6ba 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -181,10 +181,11 @@ private slots:
     void test_format_pointerdeclaration_macros();
     void test_format_pointerdeclaration_macros_data();
 
-    void test_modelmanager_paths();
+    void test_modelmanager_paths_are_clean();
     void test_modelmanager_framework_headers();
-    void test_modelmanager_refresh_1();
-    void test_modelmanager_refresh_2();
+    void test_modelmanager_refresh_also_includes_of_project_files();
+    void test_modelmanager_refresh_several_times();
+    void test_modelmanager_refresh_test_for_changes();
     void test_modelmanager_snapshot_after_two_projects();
     void test_modelmanager_extraeditorsupport_uiFiles();
     void test_modelmanager_gc_if_last_cppeditor_closed();