feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CPlusPlus: Use FilePath for resolved include paths

Browse Source 
... and fix fallout.

Change-Id: I66886e91ff476eff15db51cc024a8021e952d44d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-11-24 13:05:41 +01:00
parent dc3a4f0002
commit 39ffdb416f
25 changed files with 136 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -152,18 +152,18 @@ void UpdateIncludeDependenciesVisitor::visitMComponent(qmt::MComponent *componen
if (document) {
const QList<CPlusPlus::Document::Include> includes = document->resolvedIncludes();
for (const CPlusPlus::Document::Include &include : includes) {
QString includeFilePath = include.resolvedFileName();
Utils::FilePath includeFilePath = include.resolvedFileName();
// replace proxy header with real one
CPlusPlus::Document::Ptr includeDocument = snapshot.document(includeFilePath);
if (includeDocument) {
QList<CPlusPlus::Document::Include> includes = includeDocument->resolvedIncludes();
if (includes.count() == 1 &&
QFileInfo(includes.at(0).resolvedFileName()).fileName() == QFileInfo(includeFilePath).fileName())
includes.at(0).resolvedFileName().fileName() == includeFilePath.fileName())
{
includeFilePath = includes.at(0).resolvedFileName();
}
}
qmt::MComponent *includeComponent = findComponentFromFilePath(includeFilePath);
qmt::MComponent *includeComponent = findComponentFromFilePath(includeFilePath.toString());
if (includeComponent && includeComponent != component) {
// add dependency between components
if (!m_modelUtilities->haveDependency(component, includeComponent)) {