diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-11-01 12:21:53 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-04 14:06:09 +0000 |
commit | 34e8f58c47c589254c07bb9f39d00f89207cd445 (patch) | |
tree | 92eebfbc793f02259c12d85a9e2155a61c7cb266 /src/plugins/mcusupport | |
parent | 7d14132c8c212263b9537631e4918f74a5a6be7c (diff) |
Fix lupdate issues
Change-Id: Ib0cbb96a1a4857db5724f9d1e316b97bf2827dbd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/mcusupport')
-rw-r--r-- | src/plugins/mcusupport/mcusupportrunconfiguration.cpp | 35 | ||||
-rw-r--r-- | src/plugins/mcusupport/mcusupportrunconfiguration.h | 8 |
2 files changed, 24 insertions, 19 deletions
diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp index 4ec72227e16..c1c8a1f7a47 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp @@ -57,29 +57,26 @@ static CommandLine flashAndRunCommand(Target *target) }); } -class FlashAndRunConfiguration : public ProjectExplorer::RunConfiguration +FlashAndRunConfiguration::FlashAndRunConfiguration(Target *target, Core::Id id) + : RunConfiguration(target, id) { -public: - FlashAndRunConfiguration(Target *target, Core::Id id) - : RunConfiguration(target, id) - { - auto effectiveFlashAndRunCall = addAspect<BaseStringAspect>(); - effectiveFlashAndRunCall->setLabelText(tr("Effective flash and run call:")); - effectiveFlashAndRunCall->setDisplayStyle(BaseStringAspect::TextEditDisplay); - effectiveFlashAndRunCall->setReadOnly(true); + auto effectiveFlashAndRunCall = addAspect<BaseStringAspect>(); + effectiveFlashAndRunCall->setLabelText(tr("Effective flash and run call:")); + effectiveFlashAndRunCall->setDisplayStyle(BaseStringAspect::TextEditDisplay); + effectiveFlashAndRunCall->setReadOnly(true); - auto updateConfiguration = [target, effectiveFlashAndRunCall] { - effectiveFlashAndRunCall->setValue(flashAndRunCommand(target).toUserOutput()); - }; + auto updateConfiguration = [target, effectiveFlashAndRunCall] { + effectiveFlashAndRunCall->setValue(flashAndRunCommand(target).toUserOutput()); + }; - updateConfiguration(); + updateConfiguration(); - connect(target->activeBuildConfiguration(), &BuildConfiguration::buildDirectoryChanged, - this, updateConfiguration); - connect(target->project(), &Project::displayNameChanged, - this, updateConfiguration); - } -}; + connect(target->activeBuildConfiguration(), + &BuildConfiguration::buildDirectoryChanged, + this, + updateConfiguration); + connect(target->project(), &Project::displayNameChanged, this, updateConfiguration); +} class FlashAndRunWorker : public SimpleTargetRunner { diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.h b/src/plugins/mcusupport/mcusupportrunconfiguration.h index 2ab9c65380a..b53eea03a4a 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.h +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.h @@ -37,6 +37,14 @@ public: EmrunRunConfigurationFactory(); }; +class FlashAndRunConfiguration : public ProjectExplorer::RunConfiguration +{ + Q_OBJECT + +public: + FlashAndRunConfiguration(ProjectExplorer::Target *target, Core::Id id); +}; + ProjectExplorer::RunWorkerFactory::WorkerCreator makeFlashAndRunWorker(); } // namespace Internal |