aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cpptools/cpptoolsplugin.h
diff options
context:
space:
mode:
authorNikolai Kosjar <[email protected]>2013-05-15 11:45:30 +0200
committerNikolai Kosjar <[email protected]>2013-05-23 08:37:36 +0200
commit0d9bf5e54308ee05c8e8da011c09b845c1d1297e (patch)
tree3668357393f01b6527cf596111dee7fd612ec79e /src/plugins/cpptools/cpptoolsplugin.h
parent3e80f52414e097bbf81f059f1e6f7ead538105d3 (diff)
C++: Fix 'already seen files' when indexing
Resetting the environment (after each *.cpp file) did not clear the already seen files (m_included). Because of that the succeeding header files were not parsed correctly - the environments of the mistakenly already seen header files were not merged in. Note that this change slow downs the parsing/indexing of files to its original speed, as it was before the problematic commit (and it is in 2.7): commit 82e347095c4bdb7a6419d28798639e60591e3992 C++: Untangle include file resolving from loading. Task-number: QTCREATORBUG-9205 Change-Id: Iea57b7c59ea04a3c8843fd1291f4c375382958fc Reviewed-by: Erik Verbruggen <[email protected]>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index dd925121c1c..d3eb847e30e 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -141,7 +141,8 @@ private slots:
void test_modelmanager_paths();
void test_modelmanager_framework_headers();
- void test_modelmanager_refresh();
+ void test_modelmanager_refresh_1();
+ void test_modelmanager_refresh_2();
private:
void test_completion();