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

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
This commit is contained in:
Eike Ziller
2022-11-01 15:38:49 +01:00
parent de88d1c437 02f7c9c3eb
commit b402f35481
80 changed files with 888 additions and 396 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,