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

StudioWelcome: Fallback to the first ui.qml file if there is no main ui.qml

Browse Source 
If there is no main ui.qml, then fallback to the first ui.qml in the project.


Task-number: QDS-9242
Change-Id: Ie5294aeaf087a6b7cd2ca21ec13fb674c496f1a9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Thomas Hartmann
2023-02-22 15:18:03 +01:00
parent 9dc8b42ec9
commit a7d7df3312
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/studiowelcome/studiowelcomeplugin.cpp
View File

@@ -98,7 +98,7 @@ QPointer<QQuickView> s_viewWindow = nullptr;
QPointer<QQuickWidget> s_viewWidget = nullptr; QPointer<QQuickWidget> s_viewWidget = nullptr;
static StudioWelcomePlugin *s_pluginInstance = nullptr; static StudioWelcomePlugin *s_pluginInstance = nullptr;
static Utils::FilePath getMainUiFile() static Utils::FilePath getMainUiFileWithFallback()
{ {
auto project = ProjectExplorer::SessionManager::startupProject(); auto project = ProjectExplorer::SessionManager::startupProject();
if (!project) if (!project)
@@ -109,7 +109,18 @@ static Utils::FilePath getMainUiFile()
auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>( auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(
project->activeTarget()->buildSystem()); project->activeTarget()->buildSystem());
return qmlBuildSystem->mainUiFilePath();
auto mainUiFile = qmlBuildSystem->mainUiFilePath();
if (mainUiFile.exists())
return mainUiFile;
const Utils::FilePaths uiFiles = project->files([&](const ProjectExplorer::Node *node) {
return node->filePath().completeSuffix() == "ui.qml";
});
if (!uiFiles.isEmpty())
return uiFiles.first();
return {};
} }
std::unique_ptr<QSettings> makeUserFeedbackSettings() std::unique_ptr<QSettings> makeUserFeedbackSettings()
@@ -243,7 +254,7 @@ public:
const ProjectExplorerPlugin::OpenProjectResult result const ProjectExplorerPlugin::OpenProjectResult result
= ProjectExplorer::ProjectExplorerPlugin::openProject(projectFile); = ProjectExplorer::ProjectExplorerPlugin::openProject(projectFile);
if (!result && !result.alreadyOpen().isEmpty()) { if (!result && !result.alreadyOpen().isEmpty()) {
const auto mainUiFile = getMainUiFile(); const auto mainUiFile = getMainUiFileWithFallback();
if (mainUiFile.exists()) if (mainUiFile.exists())
Core::EditorManager::openEditor(mainUiFile, Utils::Id()); Core::EditorManager::openEditor(mainUiFile, Utils::Id());
}; };