From 542520e31c600274fb7c329983ba01c5774d4c20 Mon Sep 17 00:00:00 2001
From: Burak Hancerli <burak.hancerli@qt.io>
Date: Wed, 8 May 2024 18:18:03 +0200
Subject: [PATCH] QmlProjectManager: Fix include paths

Change-Id: I1f5b0089e8d31d96682401a87bfd21eb3f4880f5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
---
 .../buildsystem/qmlbuildsystem.cpp             | 18 +++++++++---------
 .../buildsystem/qmlbuildsystem.h               |  7 +++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index 35662a3d923..4e627c3368e 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -32,16 +32,16 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
-#include "projectexplorer/projectmanager.h"
-#include "projectitem/qmlprojectitem.h"
-#include "projectnode/qmlprojectnodes.h"
+#include <projectexplorer/projectmanager.h>
+#include <projectitem/qmlprojectitem.h>
+#include <projectnode/qmlprojectnodes.h>
 
-#include "utils/algorithm.h"
-#include "utils/filepath.h"
-#include "utils/filesystemwatcher.h"
-#include "utils/qtcassert.h"
+#include <utils/algorithm.h>
+#include <utils/filepath.h>
+#include <utils/filesystemwatcher.h>
+#include <utils/qtcassert.h>
 
-#include "texteditor/textdocument.h"
+#include <texteditor/textdocument.h>
 
 #include <QAction>
 
@@ -242,7 +242,7 @@ void QmlBuildSystem::initMcuProjectItems()
     Utils::FilePath projectDir = projectFilePath().parentDir();
     // traverse the project dir and find all other mcu projects (.qmlproject files) in the project tree
     // and add them to the m_mcuProjectItems vector
-    QDirIterator it(projectDir.toString(), QDir::Files, QDirIterator::Subdirectories);
+    QDirIterator it(projectDir.toFSPathString(), QDir::Files, QDirIterator::Subdirectories);
     while (it.hasNext()) {
         it.next();
         if (it.fileInfo().suffix() == "qmlproject" && it.filePath() != projectFilePath().toString()) {
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
index 998b5c8c937..d7e9c071245 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
@@ -6,13 +6,12 @@
 #pragma once
 
 #include "../qmlprojectmanager_global.h"
+
 #include <projectexplorer/buildsystem.h>
-#include <QtCore/qfilesystemwatcher.h>
+#include <utils/filesystemwatcher.h>
 
 #include "qmlprojectmanager/cmakegen/cmakegenerator.h"
 
-#include "utils/filesystemwatcher.h"
-
 namespace QmlProjectManager {
 
 class QmlProject;
@@ -122,7 +121,7 @@ private:
     // this is the main project item
     QSharedPointer<QmlProjectItem> m_projectItem;
     // these are the mcu project items which can be found in the project tree
-    QVector<QSharedPointer<QmlProjectItem>> m_mcuProjectItems;
+    QList<QSharedPointer<QmlProjectItem>> m_mcuProjectItems;
     Utils::FileSystemWatcher m_mcuProjectFilesWatcher;
     bool m_blockFilesUpdate = false;