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

QmlProjectManager: Fix include paths

Browse Source 
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>
This commit is contained in:
Burak Hancerli
2024-05-08 18:18:03 +02:00
parent dd20f54207
commit 542520e31c
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
View File

@@ -32,16 +32,16 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include "projectexplorer/projectmanager.h" #include <projectexplorer/projectmanager.h>
#include "projectitem/qmlprojectitem.h" #include <projectitem/qmlprojectitem.h>
#include "projectnode/qmlprojectnodes.h" #include <projectnode/qmlprojectnodes.h>
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/filepath.h" #include <utils/filepath.h>
#include "utils/filesystemwatcher.h" #include <utils/filesystemwatcher.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "texteditor/textdocument.h" #include <texteditor/textdocument.h>
#include <QAction> #include <QAction>
@@ -242,7 +242,7 @@ void QmlBuildSystem::initMcuProjectItems()
Utils::FilePath projectDir = projectFilePath().parentDir(); Utils::FilePath projectDir = projectFilePath().parentDir();
// traverse the project dir and find all other mcu projects (.qmlproject files) in the project tree // traverse the project dir and find all other mcu projects (.qmlproject files) in the project tree
// and add them to the m_mcuProjectItems vector // 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()) { while (it.hasNext()) {
it.next(); it.next();
if (it.fileInfo().suffix() == "qmlproject" && it.filePath() != projectFilePath().toString()) { if (it.fileInfo().suffix() == "qmlproject" && it.filePath() != projectFilePath().toString()) {

7
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
View File

@@ -6,13 +6,12 @@
#pragma once #pragma once
#include "../qmlprojectmanager_global.h" #include "../qmlprojectmanager_global.h"
#include <projectexplorer/buildsystem.h> #include <projectexplorer/buildsystem.h>
#include <QtCore/qfilesystemwatcher.h> #include <utils/filesystemwatcher.h>
#include "qmlprojectmanager/cmakegen/cmakegenerator.h" #include "qmlprojectmanager/cmakegen/cmakegenerator.h"
#include "utils/filesystemwatcher.h"
namespace QmlProjectManager { namespace QmlProjectManager {
class QmlProject; class QmlProject;
@@ -122,7 +121,7 @@ private:
// this is the main project item // this is the main project item
QSharedPointer<QmlProjectItem> m_projectItem; QSharedPointer<QmlProjectItem> m_projectItem;
// these are the mcu project items which can be found in the project tree // 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; Utils::FileSystemWatcher m_mcuProjectFilesWatcher;
bool m_blockFilesUpdate = false; bool m_blockFilesUpdate = false;