From 3d33886e53722ae7e2f33741085fe01c1a1178f8 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 25 Jun 2014 17:23:19 +0200 Subject: C++: fix include/framework path handling. Instead of having two lists of paths, now only one list is used where both include paths and framework paths can be mixed. This reflects the way the compiler is invoked, and retains the (correct) search order. Task-number: QTCREATORBUG-11599 Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cppsourceprocessor_test.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cppsourceprocessor_test.cpp') diff --git a/src/plugins/cpptools/cppsourceprocessor_test.cpp b/src/plugins/cpptools/cppsourceprocessor_test.cpp index 57974295f1..db7983cbf3 100644 --- a/src/plugins/cpptools/cppsourceprocessor_test.cpp +++ b/src/plugins/cpptools/cppsourceprocessor_test.cpp @@ -71,7 +71,9 @@ public: QScopedPointer sourceProcessor( CppModelManager::createSourceProcessor()); - sourceProcessor->setIncludePaths(QStringList(TestIncludePaths::directoryOfTestFile())); + const ProjectPart::HeaderPath hp(TestIncludePaths::directoryOfTestFile(), + ProjectPart::HeaderPath::IncludePath); + sourceProcessor->setHeaderPaths(ProjectPart::HeaderPaths() << hp); sourceProcessor->run(fileName); Document::Ptr document = m_cmm->document(fileName); -- cgit v1.2.1