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

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

Browse Source 
Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b
This commit is contained in:
Tim Jenssen
2022-11-03 14:09:36 +01:00
parent f51162a3fe 8de9892c4e
commit 40072fb5c7
206 changed files with 2163 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,14 @@ static int preferedQtTarget(Target *target)
return 5;
}
static bool allowOnlySingleProject()
{
QSettings *settings = Core::ICore::settings();
const QString qdsAllowMultipleProjects = "QML/Designer/AllowMultipleProjects";
return !settings->value(qdsAllowMultipleProjects, false).toBool();
}
Utils::FilePaths QmlProject::getUiQmlFilesForFolder(const Utils::FilePath &folder)
{
const Utils::FilePaths uiFiles = files([&](const ProjectExplorer::Node *node) {
@@ -86,9 +94,10 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
setBuildSystemCreator([](Target *t) { return new QmlBuildSystem(t); });
if (QmlProject::isQtDesignStudio()) {
EditorManager::closeAllDocuments();
SessionManager::closeAllProjects();
if (allowOnlySingleProject()) {
EditorManager::closeAllDocuments();
SessionManager::closeAllProjects();
}
m_openFileConnection
= connect(this,