diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-06-25 17:23:19 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-07-04 13:51:36 +0200 |
| commit | 3d33886e53722ae7e2f33741085fe01c1a1178f8 (patch) | |
| tree | 132429c7f2acac09a906cc549dcbd93fe8c90e70 /src/plugins/cpptools/cppsourceprocessor_test.cpp | |
| parent | 76152088e93258cdd025f49902270a7c53757633 (diff) | |
| download | qt-creator-3d33886e53722ae7e2f33741085fe01c1a1178f8.tar.gz | |
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 <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppsourceprocessor_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppsourceprocessor_test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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<CppSourceProcessor> 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); |