From 23cd42557dc305dfc72fdf2070dd85956e154444 Mon Sep 17 00:00:00 2001 From: Finn Brudal Date: Tue, 31 May 2016 10:35:56 +0200 Subject: CppTools: Fix include/framework search order Task-number: QTCREATORBUG-11599 Change-Id: Ie0bd25e0d6376b5e2c0e251e64aad8dfb773e76e Reviewed-by: Eike Ziller Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppsourceprocessor.cpp | 30 ++++++++++++----------------- 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'src/plugins/cpptools/cppsourceprocessor.cpp') diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index ac6ccd0950..f238a841f7 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -291,25 +291,19 @@ QString CppSourceProcessor::resolveFile_helper(const QString &fileName, ProjectPartHeaderPaths::Iterator headerPathsIt) { auto headerPathsEnd = m_headerPaths.end(); - for (; headerPathsIt != headerPathsEnd; ++headerPathsIt) { - if (headerPathsIt->isFrameworkPath()) - continue; - const QString path = headerPathsIt->path + fileName; - if (m_workingCopy.contains(path) || checkFile(path)) - return path; - } - const int index = fileName.indexOf(QLatin1Char('/')); - if (index != -1) { - const QString frameworkName = fileName.left(index); - const QString name = frameworkName + QLatin1String(".framework/Headers/") - + fileName.mid(index + 1); - - foreach (const ProjectPartHeaderPath &headerPath, m_headerPaths) { - if (!headerPath.isFrameworkPath()) - continue; - const QString path = headerPath.path + name; - if (checkFile(path)) + for (; headerPathsIt != headerPathsEnd; ++headerPathsIt) { + if (headerPathsIt->isValid()) { + QString path; + if (headerPathsIt->isFrameworkPath()) { + if (index == -1) + continue; + path = headerPathsIt->path + fileName.left(index) + + QLatin1String(".framework/Headers/") + fileName.mid(index + 1); + } else { + path = headerPathsIt->path + fileName; + } + if (m_workingCopy.contains(path) || checkFile(path)) return path; } } -- cgit v1.2.1