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

QmlDesigner: Improve main qmlFile fallback logic

Browse Source 
Change-Id: Ie08373478518e17c9c0525b945ff5397eeb824a0
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
This commit is contained in:
Aleksei German
2023-06-27 12:24:31 +02:00
parent 5bd9721f01
commit d7a60e4118
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,12 +342,16 @@ Utils::FilePath QmlBuildSystem::getStartupQmlFileWithFallback() const
const QStringView uiqmlstr = u"ui.qml"; const QStringView uiqmlstr = u"ui.qml";
const QStringView qmlstr = u"qml"; const QStringView qmlstr = u"qml";
//we will check mainUiFile twice: //we will check mainUiFile and mainFile twice:
//first priority if it's ui.qml file, second if it's just a qml file //first priority if it's ui.qml file, second if it's just a qml file
const Utils::FilePath mainUiFile = mainUiFilePath(); const Utils::FilePath mainUiFile = mainUiFilePath();
if (mainUiFile.exists() && mainUiFile.completeSuffix() == uiqmlstr) if (mainUiFile.exists() && mainUiFile.completeSuffix() == uiqmlstr)
return mainUiFile; return mainUiFile;
const Utils::FilePath mainQmlFile = mainFilePath();
if (mainQmlFile.exists() && mainQmlFile.completeSuffix() == uiqmlstr)
return mainQmlFile;
const Utils::FilePaths uiFiles = currentProject->files([&](const ProjectExplorer::Node *node) { const Utils::FilePaths uiFiles = currentProject->files([&](const ProjectExplorer::Node *node) {
return node->filePath().completeSuffix() == uiqmlstr; return node->filePath().completeSuffix() == uiqmlstr;
}); });
@@ -356,11 +360,10 @@ Utils::FilePath QmlBuildSystem::getStartupQmlFileWithFallback() const
return file; return file;
} }
//check the suffix of mainUiFile again, since there are no ui.qml files: //check the suffix of mainUiFiles again, since there are no ui.qml files:
if (mainUiFile.exists() && mainUiFile.completeSuffix() == qmlstr) if (mainUiFile.exists() && mainUiFile.completeSuffix() == qmlstr)
return mainUiFile; return mainUiFile;
const Utils::FilePath mainQmlFile = mainFilePath();
if (mainQmlFile.exists() && mainQmlFile.completeSuffix() == qmlstr) if (mainQmlFile.exists() && mainQmlFile.completeSuffix() == qmlstr)
return mainQmlFile; return mainQmlFile;