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

Merge remote-tracking branch 'origin/11.0' into qds/dev

Browse Source 
Conflicts:
  src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
  src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
  src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I4c8a33736b25c3bb24241224d0a1e7358bb7fd94
This commit is contained in:
Tim Jenssen
2023-06-08 16:21:43 +02:00
parent 263152cc81 69d1f24316
commit 66263782ec
156 changed files with 1603 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,9 @@ void QmlBuildSystem::updateDeploymentData()
}
ProjectExplorer::DeploymentData deploymentData;
for (const auto &file : m_projectItem->files())
deploymentData.addFile(file, m_projectItem->targetDirectory());
for (const auto &file : m_projectItem->files()) {
deploymentData.addFile(file, targetFile(file).parentDir().path());
}
setDeploymentData(deploymentData);
}
@@ -187,7 +188,7 @@ void QmlBuildSystem::refresh(RefreshOptions options)
project()->files(Project::HiddenRccFolders));
for (const QString &searchPath : customImportPaths()) {
projectInfo.importPaths.maybeInsert(projectFilePath().pathAppended(searchPath),
projectInfo.importPaths.maybeInsert(projectDirectory().pathAppended(searchPath),
QmlJS::Dialect::Qml);
}