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

QmlDesigner: Improve project open functions

Browse Source 
This patch:
unifies lookup for the first qml file to open;
increases number of possible fallback options;
adds missing implementations to some methods in QmlBuildSystem.

Task-number: QDS-9984
Change-Id: Ib282b1fca8b0564fe80f00e3d9ffe82c1a15c540
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2023-06-22 19:34:15 +02:00
parent 96cd0b3668
commit fcab6a10d2
4 changed files with 97 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -67,40 +67,24 @@ void QmlProject::parsingFinished(const Target *target, bool success)
// trigger only once
disconnect(this, &QmlProject::anyParsingFinished, this, &QmlProject::parsingFinished);
// FIXME: what to do in this case?
if (!target || !success || !activeTarget())
return;
auto targetActive = activeTarget();
auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(
targetActive->buildSystem());
const Utils::FilePath mainUiFile = qmlBuildSystem->mainUiFilePath();
if (mainUiFile.completeSuffix() == "ui.qml" && mainUiFile.exists()) {
QTimer::singleShot(1000, [mainUiFile]() {
Core::EditorManager::openEditor(mainUiFile, Utils::Id());
});
const auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(
activeTarget()->buildSystem());
if (!qmlBuildSystem)
return;
}
Utils::FilePaths uiFiles = collectUiQmlFilesForFolder(
projectDirectory().pathAppended("content"));
if (uiFiles.isEmpty()) {
uiFiles = collectUiQmlFilesForFolder(projectDirectory());
if (uiFiles.isEmpty())
return;
}
Utils::FilePath currentFile;
if (auto cd = Core::EditorManager::currentDocument())
currentFile = cd->filePath();
if (currentFile.isEmpty() || !isKnownFile(currentFile)) {
QTimer::singleShot(1000, [uiFiles]() {
Core::EditorManager::openEditor(uiFiles.first(), Utils::Id());
const auto openFile = [&](const Utils::FilePath file) {
//why is this timer needed here?
QTimer::singleShot(1000, this, [file] {
Core::EditorManager::openEditor(file, Utils::Id());
});
}
};
const Utils::FilePath fileToOpen = qmlBuildSystem->getStartupQmlFileWithFallback();
if (!fileToOpen.isEmpty() && fileToOpen.exists() && !fileToOpen.isDir())
openFile(fileToOpen);
}
Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *errorMessage)
@@ -175,6 +159,14 @@ Utils::FilePaths QmlProject::collectUiQmlFilesForFolder(const Utils::FilePath &f
return uiFiles;
}
Utils::FilePaths QmlProject::collectQmlFiles() const
{
const Utils::FilePaths qmlFiles = files([&](const Node *node) {
return node->filePath().completeSuffix() == "qml";
});
return qmlFiles;
}
Tasks QmlProject::projectIssues(const Kit *k) const
{
Tasks result = Project::projectIssues(k);