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

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

Browse Source 
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
This commit is contained in:
Tim Jenssen
2023-10-05 15:01:35 +02:00
parent 257af1ebd8 97ca8cc270
commit 85ea2758ac
329 changed files with 14186 additions and 5756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
setNeedsBuildConfigurations(false);
setBuildSystemCreator([](Target *t) { return new QmlBuildSystem(t); });
if (QmlProject::isQtDesignStudio()) {
if (Core::ICore::isQtDesignStudio()) {
if (allowOnlySingleProject()) {
EditorManager::closeAllDocuments();
ProjectManager::closeAllProjects();
@@ -113,7 +113,7 @@ Project::RestoreResult QmlProject::fromMap(const Store &map, QString *errorMessa
// FIXME: are there any other way?
// What if it's not a Design Studio project? What should we do then?
if (QmlProject::isQtDesignStudio()) {
if (Core::ICore::isQtDesignStudio()) {
int preferedVersion = preferedQtTarget(activeTarget());
setKitWithVersion(preferedVersion, kits);
@@ -207,13 +207,6 @@ Tasks QmlProject::projectIssues(const Kit *k) const
return result;
}
bool QmlProject::isQtDesignStudio()
{
QtcSettings *settings = Core::ICore::settings();
const Key qdsStandaloneEntry = "QML/Designer/StandAloneMode";
return settings->value(qdsStandaloneEntry, false).toBool();
}
bool QmlProject::isQtDesignStudioStartedFromQtC()
{
return qEnvironmentVariableIsSet(Constants::enviromentLaunchedQDS);
@@ -226,7 +219,7 @@ DeploymentKnowledge QmlProject::deploymentKnowledge() const
bool QmlProject::isEditModePreferred() const
{
return !isQtDesignStudio();
return !Core::ICore::isQtDesignStudio();
}
int QmlProject::preferedQtTarget(Target *target)