diff options
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlproject.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 619b590c112..ce7bd362877 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -51,7 +51,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(); @@ -111,7 +111,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro // 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); @@ -205,13 +205,6 @@ Tasks QmlProject::projectIssues(const Kit *k) const return result; } -bool QmlProject::isQtDesignStudio() -{ - QSettings *settings = Core::ICore::settings(); - const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode"; - return settings->value(qdsStandaloneEntry, false).toBool(); -} - bool QmlProject::isQtDesignStudioStartedFromQtC() { return qEnvironmentVariableIsSet(Constants::enviromentLaunchedQDS); @@ -224,7 +217,7 @@ DeploymentKnowledge QmlProject::deploymentKnowledge() const bool QmlProject::isEditModePreferred() const { - return !isQtDesignStudio(); + return !Core::ICore::isQtDesignStudio(); } int QmlProject::preferedQtTarget(Target *target) @@ -238,7 +231,7 @@ int QmlProject::preferedQtTarget(Target *target) bool QmlProject::allowOnlySingleProject() { - QSettings *settings = Core::ICore::settings(); + auto settings = Core::ICore::settings(); auto key = "QML/Designer/AllowMultipleProjects"; return !settings->value(QString::fromUtf8(key), false).toBool(); } |