diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index 9d6be4e1c7c..2233538196f 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -195,7 +195,7 @@ QList getFilesFromQrc(QFile *file, bool inProjec return fileList; } -void GenerateResource::generateMenuEntry() +void GenerateResource::generateMenuEntry(QObject *parent) { Core::ActionContainer *menu = Core::ActionManager::actionContainer(Core::Constants::M_FILE); @@ -203,7 +203,7 @@ void GenerateResource::generateMenuEntry() const Core::Context projectContext(QmlProjectManager::Constants::QML_PROJECT_ID); // ToDo: move this to QtCreator and add tr to the string then auto action = new QAction(QCoreApplication::translate("QmlDesigner::GenerateResource", - "Generate QRC Resource File")); + "Generate QRC Resource File"), parent); action->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr); // todo make it more intelligent when it gets enabled QObject::connect(ProjectExplorer::SessionManager::instance(), @@ -352,7 +352,7 @@ void GenerateResource::generateMenuEntry() // ToDo: move this to QtCreator and add tr to the string then auto rccAction = new QAction(QCoreApplication::translate("QmlDesigner::GenerateResource", - "Generate Deployable Package")); + "Generate Deployable Package"), parent); rccAction->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr); QObject::connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged, [rccAction]() { diff --git a/src/plugins/qmldesigner/generateresource.h b/src/plugins/qmldesigner/generateresource.h index 42d96c2d513..d96274efe5e 100644 --- a/src/plugins/qmldesigner/generateresource.h +++ b/src/plugins/qmldesigner/generateresource.h @@ -33,7 +33,7 @@ struct ResourceFile QString fileName; bool inProject; }; - void generateMenuEntry(); + void generateMenuEntry(QObject *parent); QStringList getFileList(const QList &); QTableWidget* createFilesTable(const QList &); } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 1ce53ee8d71..131bedac04d 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -237,7 +237,7 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e return false; d = new QmlDesignerPluginPrivate; if (QmlProjectManager::QmlProject::isQtDesignStudio()) - GenerateResource::generateMenuEntry(); + GenerateResource::generateMenuEntry(this); const QString fontPath = Core::ICore::resourcePath( diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp index 559bd42cefb..d64dc672503 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp @@ -56,11 +56,11 @@ const QString ERROR_TEXT = QCoreApplication::translate("QmlDesigner::CmakeProjec const QString SUCCESS_TEXT = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", "Creating project succeeded."); -void CmakeProjectConverter::generateMenuEntry() +void CmakeProjectConverter::generateMenuEntry(QObject *parent) { Core::ActionContainer *menu = Core::ActionManager::actionContainer(Core::Constants::M_FILE); - auto action = new QAction(MENU_ITEM_CONVERT); + auto action = new QAction(MENU_ITEM_CONVERT, parent); QObject::connect(action, &QAction::triggered, CmakeProjectConverter::onConvertProject); Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.ConvertToCmakeProject"); menu->addAction(cmd, Core::Constants::G_FILE_EXPORT); diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h index 0efad68ac7a..1022f657b27 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.h @@ -49,7 +49,7 @@ class CmakeProjectConverter { public: bool convertProject(const QmlProjectManager::QmlProject *project, const Utils::FilePath &targetDir); - static void generateMenuEntry(); + static void generateMenuEntry(QObject *parent); static void onConvertProject(); static bool isProjectConvertable(const ProjectExplorer::Project *project); static bool isProjectCurrentFormat(const ProjectExplorer::Project *project); diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index 380cbc70873..5dde651ded2 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -81,11 +81,11 @@ enum ProjectDirectoryError { const QString MENU_ITEM_GENERATE = QCoreApplication::translate("QmlDesigner::GenerateCmake", "Generate CMake Build Files"); -void generateMenuEntry() +void generateMenuEntry(QObject *parent) { Core::ActionContainer *menu = Core::ActionManager::actionContainer(Core::Constants::M_FILE); - auto action = new QAction(MENU_ITEM_GENERATE); + auto action = new QAction(MENU_ITEM_GENERATE, parent); QObject::connect(action, &QAction::triggered, GenerateCmake::onGenerateCmakeLists); Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.CreateCMakeLists"); menu->addAction(cmd, Core::Constants::G_FILE_EXPORT); diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h index 20020f51f34..02cf19b7028 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.h @@ -39,7 +39,7 @@ struct GeneratableFile { bool operator==(const GeneratableFile &left, const GeneratableFile &right); -void generateMenuEntry(); +void generateMenuEntry(QObject *parent); void onGenerateCmakeLists(); bool isErrorFatal(int error); int isProjectCorrectlyFormed(const Utils::FilePath &rootDir); diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 4c98a998838..e06f0016db9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -378,8 +378,8 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) }); } - GenerateCmake::generateMenuEntry(); - GenerateCmake::CmakeProjectConverter::generateMenuEntry(); + GenerateCmake::generateMenuEntry(this); + GenerateCmake::CmakeProjectConverter::generateMenuEntry(this); return true; }