summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-10 15:39:27 +0200
committerhjk <hjk@qt.io>2018-09-11 07:51:11 +0000
commit69753cf9b60ec480d71654329daeb320d144f03b (patch)
treeb848323cdfe18e89114b5cdfcbbea980edbefea0 /src/plugins/qmlprofiler
parent02d8dde4c971b7a7afc4a0dd562bf4b85645f689 (diff)
downloadqt-creator-69753cf9b60ec480d71654329daeb320d144f03b.tar.gz
ProjectExplorer: Remove direct runconfig dependency from ISettingsAspect
Change-Id: I5d8a6a31f6bf97c34163b64b8d37f9ea070717ba Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilersettings.cpp9
-rw-r--r--src/plugins/qmlprofiler/qmlprofilersettings.h3
3 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
index acdcff8fc4..d513ee0ad5 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
@@ -37,7 +37,7 @@ QmlProfilerRunConfigurationAspect::QmlProfilerRunConfigurationAspect(
ProjectExplorer::RunConfiguration *parent) :
ProjectExplorer::IRunConfigurationAspect(parent)
{
- setProjectSettings(new QmlProfilerSettings(parent));
+ setProjectSettings(new QmlProfilerSettings);
setGlobalSettings(QmlProfilerPlugin::globalSettings());
setId(Constants::SETTINGS);
setDisplayName(QCoreApplication::translate("QmlProfilerRunConfiguration", "QML Profiler Settings"));
diff --git a/src/plugins/qmlprofiler/qmlprofilersettings.cpp b/src/plugins/qmlprofiler/qmlprofilersettings.cpp
index 1a6bdc63dd..11b2c99d9f 100644
--- a/src/plugins/qmlprofiler/qmlprofilersettings.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilersettings.cpp
@@ -34,8 +34,8 @@
namespace QmlProfiler {
namespace Internal {
-QmlProfilerSettings::QmlProfilerSettings(ProjectExplorer::RunConfiguration *runConfiguration) :
- ProjectExplorer::ISettingsAspect(runConfiguration)
+QmlProfilerSettings::QmlProfilerSettings()
+ : ProjectExplorer::ISettingsAspect([this] { return new QmlProfilerConfigWidget(this); })
{
QVariantMap defaults;
defaults.insert(QLatin1String(Constants::FLUSH_INTERVAL), 1000);
@@ -54,11 +54,6 @@ QmlProfilerSettings::QmlProfilerSettings(ProjectExplorer::RunConfiguration *runC
fromMap(map);
}
-QWidget *QmlProfilerSettings::createConfigWidget(QWidget *parent)
-{
- return new Internal::QmlProfilerConfigWidget(this, parent);
-}
-
bool QmlProfilerSettings::flushEnabled() const
{
return m_flushEnabled;
diff --git a/src/plugins/qmlprofiler/qmlprofilersettings.h b/src/plugins/qmlprofiler/qmlprofilersettings.h
index 6e273757f2..6af1b65de9 100644
--- a/src/plugins/qmlprofiler/qmlprofilersettings.h
+++ b/src/plugins/qmlprofiler/qmlprofilersettings.h
@@ -34,8 +34,7 @@ class QmlProfilerSettings : public ProjectExplorer::ISettingsAspect
{
Q_OBJECT
public:
- QmlProfilerSettings(ProjectExplorer::RunConfiguration *runConfiguration = nullptr);
- QWidget *createConfigWidget(QWidget *parent) override;
+ QmlProfilerSettings();
bool flushEnabled() const;
void setFlushEnabled(bool flushEnabled);