diff options
author | hjk <hjk@qt.io> | 2019-11-21 15:37:48 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-11-25 09:39:21 +0000 |
commit | 5795dc24c70ea10a622a2a98d4778aad405984af (patch) | |
tree | fbad946b99a137135e9483ce11e1eb3afe8bd3b9 | |
parent | cf8099f9018081f5e37ac7f4ca05dcf01b217124 (diff) | |
download | qt-creator-5795dc24c70ea10a622a2a98d4778aad405984af.tar.gz |
Valgrind: Minor code simplification
Change-Id: I64b218d76f4c65686a346bf884ceb8323b62f9f1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 72d33d719b..21219108ff 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -709,20 +709,18 @@ void MemcheckToolPrivate::heobAction() Abi abi; bool hasLocalRc = false; Kit *kit = nullptr; - if (Project *project = SessionManager::startupProject()) { - if (Target *target = project->activeTarget()) { - if (RunConfiguration *rc = target->activeRunConfiguration()) { - kit = target->kit(); - if (kit) { - abi = ToolChainKitAspect::targetAbi(kit); - - const Runnable runnable = rc->runnable(); - sr = runnable; - const IDevice::ConstPtr device = sr.device; - hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; - if (!hasLocalRc) - hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; - } + if (Target *target = SessionManager::startupTarget()) { + if (RunConfiguration *rc = target->activeRunConfiguration()) { + kit = target->kit(); + if (kit) { + abi = ToolChainKitAspect::targetAbi(kit); + + const Runnable runnable = rc->runnable(); + sr = runnable; + const IDevice::ConstPtr device = sr.device; + hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; + if (!hasLocalRc) + hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } } } |