From 1fad00f9991b86c3a329410c95f148b6ce3ef0d3 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 28 Jun 2013 11:26:02 +0200 Subject: CppTools: Fix snapshot in case another project is opened When a second project was opened the snapshot was reset. That resulted in all kinds of problems since from then on the code model effectively was not aware of the files of the first project. The regression was introduced by commit a0d6df7b. Change-Id: I1ccc9de68177205b49a4ba8ead2bc8abe4592b32 Reviewed-by: Fawzi Mohamed --- src/plugins/cpptools/cpptoolsplugin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/plugins/cpptools/cpptoolsplugin.h') diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 4c983bab6c..d10c690221 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -163,6 +163,7 @@ private slots: void test_modelmanager_framework_headers(); void test_modelmanager_refresh_1(); void test_modelmanager_refresh_2(); + void test_modelmanager_snapshot_after_two_projects(); private: void test_completion(); -- cgit v1.2.1 From c264c0d2137d15ec3746ed0f3bd80f225671b4a6 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 1 Jul 2013 10:25:03 +0200 Subject: C++: Fix resolving ui_* files in CppPreprocessor The working copy contains the artificial ui_* files and therefore we have to consider it while resolving include files. Task-number: QTCREATORBUG-9683 Change-Id: Icb3387b4cd885b3652bae3f1da465d3e0f633332 Reviewed-by: Christian Stenger Reviewed-by: Eike Ziller Reviewed-by: Daniel Teske Reviewed-by: Robert Loehning Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpptoolsplugin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/plugins/cpptools/cpptoolsplugin.h') diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index d10c690221..09bea7fc3c 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -164,6 +164,7 @@ private slots: 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(); -- cgit v1.2.1