diff options
author | hjk <hjk@qt.io> | 2018-04-06 14:13:07 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-04-09 10:57:36 +0000 |
commit | 0df9d6dda94e73ee3bad15384ee4c31a8e0d77f9 (patch) | |
tree | 99ea8394260768ae04a924e13d8e79f0d8da005b /src/plugins/qmlprojectmanager | |
parent | eea6a7c3b3920187d3367c2b3d20c1d74b6eafcd (diff) | |
download | qt-creator-0df9d6dda94e73ee3bad15384ee4c31a8e0d77f9.tar.gz |
ProjectExplorer: De-qobject-ify RunConfigurationFactory
Some translations moved over to the corresponding RunConfigurations,
one setParent() replaced by direct deletion.
Change-Id: Ib5e527b71353a6be70b332ac2dfd2f5cd2499a60
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 87bce94ee9..6e460d3e0b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -41,14 +41,14 @@ namespace Internal { QmlProjectPlugin::~QmlProjectPlugin() { + delete m_rcFactory; } bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) { Q_UNUSED(errorMessage) - auto rcFactory = new QmlProjectRunConfigurationFactory; - rcFactory->setParent(this); + m_rcFactory = new QmlProjectRunConfigurationFactory; ProjectManager::registerProjectType<QmlProject>(QmlJSTools::Constants::QMLPROJECT_MIMETYPE); Core::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject"); diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.h b/src/plugins/qmlprojectmanager/qmlprojectplugin.h index 521840c3a6..d08738cfa9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.h +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.h @@ -42,6 +42,8 @@ public: private: bool initialize(const QStringList &arguments, QString *errorString) final; void extensionsInitialized() final {} + + class QmlProjectRunConfigurationFactory *m_rcFactory = nullptr; }; } // namespace Internal diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index 274d6d1b49..e5abbcc0b3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -32,7 +32,7 @@ namespace QmlProjectManager { namespace Internal { QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory() : - ProjectExplorer::FixedRunConfigurationFactory(tr("QML Scene"), false) + ProjectExplorer::FixedRunConfigurationFactory(QmlProjectRunConfiguration::tr("QML Scene"), false) { registerRunConfiguration<QmlProjectRunConfiguration>(Constants::QML_SCENE_RC_ID); addSupportedProjectType(QmlProjectManager::Constants::QML_PROJECT_ID); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h index f5633ce8d9..0a94d3c4f3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h @@ -32,8 +32,6 @@ namespace Internal { class QmlProjectRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory { - Q_OBJECT - public: QmlProjectRunConfigurationFactory(); }; |