diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index de8cd5a80b4..63370a82f18 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -227,9 +228,12 @@ void GenerateResource::generateMenuEntry(QObject *parent) action->setEnabled(ProjectExplorer::ProjectManager::startupProject() != nullptr); // todo make it more intelligent when it gets enabled QObject::connect(ProjectExplorer::ProjectManager::instance(), - &ProjectExplorer::ProjectManager::startupProjectChanged, [action]() { - action->setEnabled(ProjectExplorer::ProjectManager::startupProject()); - }); + &ProjectExplorer::ProjectManager::startupProjectChanged, + [action]() { + if (auto buildSystem + = QmlProjectManager::QmlBuildSystem::getStartupBuildSystem()) + action->setEnabled(!buildSystem->qtForMCUs()); + }); Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.CreateResource"); QObject::connect(action, &QAction::triggered, [] () { diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp index 4016cc6ac6f..5131d9c57cc 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp @@ -32,6 +32,7 @@ #include #include +#include "projectexplorer/projectmanager.h" #include "projectitem/qmlprojectitem.h" #include "projectnode/qmlprojectnodes.h" @@ -389,6 +390,16 @@ Utils::FilePath QmlBuildSystem::getStartupQmlFileWithFallback() const return {}; } +QmlBuildSystem *QmlBuildSystem::getStartupBuildSystem() +{ + auto project = ProjectExplorer::ProjectManager::startupProject(); + if (project && project->activeTarget() && project->activeTarget()->buildSystem()) { + return qobject_cast( + project->activeTarget()->buildSystem()); + } + return nullptr; +} + Utils::FilePath QmlBuildSystem::mainFilePath() const { const QString fileName = mainFile(); diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h index 95b66871eb7..3615979e2df 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h @@ -102,6 +102,8 @@ public: Utils::FilePath getStartupQmlFileWithFallback() const; + static QmlBuildSystem *getStartupBuildSystem(); + signals: void projectChanged(); diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp index 21a538c7c51..232d822cd5d 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -44,9 +45,15 @@ void CmakeProjectConverter::generateMenuEntry(QObject *parent) action->setEnabled(isProjectConvertable(ProjectExplorer::ProjectManager::startupProject())); QObject::connect(ProjectExplorer::ProjectManager::instance(), - &ProjectExplorer::ProjectManager::startupProjectChanged, [action]() { - action->setEnabled(isProjectConvertable(ProjectExplorer::ProjectManager::startupProject())); - }); + &ProjectExplorer::ProjectManager::startupProjectChanged, + [action]() { + auto currentBuildSystem = QmlBuildSystem::getStartupBuildSystem(); + bool isMCU = currentBuildSystem ? currentBuildSystem->qtForMCUs() : false; + + action->setEnabled(isMCU + && isProjectConvertable( + ProjectExplorer::ProjectManager::startupProject())); + }); } bool CmakeProjectConverter::isProjectConvertable(const ProjectExplorer::Project *project) diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index cee9eb247e6..76452c3e782 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -85,16 +86,6 @@ enum ProjectDirectoryError { const QString MENU_ITEM_GENERATE = Tr::tr("Generate CMake Build Files..."); -const QmlBuildSystem *getBuildSystem() -{ - auto project = ProjectExplorer::ProjectManager::startupProject(); - if (project && project->activeTarget() && project->activeTarget()->buildSystem()) { - return qobject_cast( - project->activeTarget()->buildSystem()); - } - return nullptr; -} - void generateMenuEntry(QObject *parent) { Core::ActionContainer *menu = Core::ActionManager::actionContainer(Core::Constants::M_FILE); @@ -118,7 +109,7 @@ void generateMenuEntry(QObject *parent) QObject::connect(ProjectExplorer::ProjectManager::instance(), &ProjectExplorer::ProjectManager::startupProjectChanged, [action]() { - if (auto buildSystem = getBuildSystem()) + if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) action->setEnabled(!buildSystem->qtForMCUs()); }); } @@ -284,7 +275,7 @@ const QString projectEnvironmentVariable(const QString &key) { QString value = {}; - if (auto buildSystem = getBuildSystem()) { + if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) { auto envItems = buildSystem->environment(); auto confEnv = std::find_if(envItems.begin(), envItems.end(), [key](NameValueItem &item) { return item.name == key; @@ -636,7 +627,7 @@ bool CmakeFileGenerator::generateMainCpp(const FilePath &dir) bool envHeaderOk = true; QString environment; - if (auto buildSystem = getBuildSystem()) { + if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) { for (EnvironmentItem &envItem : buildSystem->environment()) { QString key = envItem.name; QString value = envItem.value;