diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-12 14:40:46 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-12-12 13:45:38 +0000 |
commit | f29a4440fe44b858a4c52ada3480303e90faebb6 (patch) | |
tree | ac3448d427b724ecc625e10d742d7d26eab0b286 /src/plugins/qnx/qnxrunconfiguration.cpp | |
parent | 864e79980bb24f0f58ff2294efda7c2bc0ab33a1 (diff) | |
download | qt-creator-f29a4440fe44b858a4c52ada3480303e90faebb6.tar.gz |
Qnx: Add QnxRunConfiguration::doAdditionalSetup()
Same principle as in b526d789cf.
Change-Id: I79b69f709ab401b46d2edef3b5a6b0672e30eaff
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qnx/qnxrunconfiguration.cpp')
-rw-r--r-- | src/plugins/qnx/qnxrunconfiguration.cpp | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index d9b3522207..733f80fa2d 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -68,22 +68,14 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id) libAspect->setLabelText(tr("Path to Qt libraries on device")); libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); - auto updateTargetInformation = [this, target, exeAspect, symbolsAspect] { - - const BuildTargetInfo bti = buildTargetInfo(); - const FilePath localExecutable = bti.targetFilePath; - const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable); - - exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath())); - symbolsAspect->setFilePath(localExecutable); - - emit enabledChanged(); - }; - - connect(target, &Target::deploymentDataChanged, this, updateTargetInformation); - connect(target, &Target::applicationTargetsChanged, this, updateTargetInformation); - connect(target->project(), &Project::parsingFinished, this, updateTargetInformation); - connect(target, &Target::kitChanged, this, updateTargetInformation); + connect(target, &Target::deploymentDataChanged, + this, &QnxRunConfiguration::updateTargetInformation); + connect(target, &Target::applicationTargetsChanged, + this, &QnxRunConfiguration::updateTargetInformation); + connect(target->project(), &Project::parsingFinished, + this, &QnxRunConfiguration::updateTargetInformation); + connect(target, &Target::kitChanged, + this, &QnxRunConfiguration::updateTargetInformation); } Runnable QnxRunConfiguration::runnable() const @@ -100,6 +92,22 @@ Runnable QnxRunConfiguration::runnable() const return r; } +void QnxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &) +{ + updateTargetInformation(); +} + +void QnxRunConfiguration::updateTargetInformation() +{ + const BuildTargetInfo bti = buildTargetInfo(); + const FilePath localExecutable = bti.targetFilePath; + const DeployableFile depFile = target()->deploymentData() + .deployableForLocalFile(localExecutable); + aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath())); + aspect<SymbolFileAspect>()->setFilePath(localExecutable); + emit enabledChanged(); +} + // QnxRunConfigurationFactory QnxRunConfigurationFactory::QnxRunConfigurationFactory() |