summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Mattila <tapani.mattila@qt.io>2022-01-12 13:17:11 +0200
committerTapani Mattila <tapani.mattila@qt.io>2022-01-18 10:32:25 +0000
commitc57573708a12b05d0332363e5f17fea6a71d6c82 (patch)
treeda7e90bb3d0881765450980c461ed3a9ccf1268a
parent54e7d41726d4fc755bd4d2c8074433d241127335 (diff)
downloadqt-creator-c57573708a12b05d0332363e5f17fea6a71d6c82.tar.gz
Move qrc, rcc and CMakeLists.txt generating menu option to file menu
Task-number: QDS-5903 Change-Id: I42cba21eaecaf5580c40dab8ce32bbf12c37f13f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/generatecmakelists.cpp8
-rw-r--r--src/plugins/qmldesigner/generateresource.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/generatecmakelists.cpp b/src/plugins/qmldesigner/generatecmakelists.cpp
index 3cadb3a9b0..7609a31c15 100644
--- a/src/plugins/qmldesigner/generatecmakelists.cpp
+++ b/src/plugins/qmldesigner/generatecmakelists.cpp
@@ -81,12 +81,12 @@ QVector<GeneratableFile> queuedFiles;
void generateMenuEntry()
{
- Core::ActionContainer *buildMenu =
- Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
- auto action = new QAction(QCoreApplication::translate("QmlDesigner::GenerateCmake", "Generate CMakeLists.txt Files"));
+ Core::ActionContainer *menu =
+ Core::ActionManager::actionContainer(Core::Constants::M_FILE);
+ auto action = new QAction(QCoreApplication::translate("QmlDesigner::GenerateCmake", "Export to Qt Creator (CMake)"));
QObject::connect(action, &QAction::triggered, GenerateCmake::onGenerateCmakeLists);
Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.CreateCMakeLists");
- buildMenu->addAction(cmd, ProjectExplorer::Constants::G_BUILD_RUN);
+ menu->addAction(cmd, Core::Constants::G_FILE_EXPORT);
action->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr);
QObject::connect(ProjectExplorer::SessionManager::instance(),
diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp
index f700fd7919..5ad0fe7b81 100644
--- a/src/plugins/qmldesigner/generateresource.cpp
+++ b/src/plugins/qmldesigner/generateresource.cpp
@@ -195,8 +195,8 @@ QList<GenerateResource::ResourceFile> getFilesFromQrc(QFile *file, bool inProjec
void GenerateResource::generateMenuEntry()
{
- Core::ActionContainer *buildMenu =
- Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
+ Core::ActionContainer *menu =
+ Core::ActionManager::actionContainer(Core::Constants::M_FILE);
const Core::Context projectContext(QmlProjectManager::Constants::QML_PROJECT_ID);
// ToDo: move this to QtCreator and add tr to the string then
@@ -573,8 +573,8 @@ void GenerateResource::generateMenuEntry()
}
}
});
- buildMenu->addAction(cmd, ProjectExplorer::Constants::G_BUILD_RUN);
- buildMenu->addAction(cmd2, ProjectExplorer::Constants::G_BUILD_RUN);
+ menu->addAction(cmd, Core::Constants::G_FILE_EXPORT);
+ menu->addAction(cmd2, Core::Constants::G_FILE_EXPORT);
}
} // namespace QmlDesigner