From d093a7b69df86fa5f1e4d59f1300ed66dc106f27 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Thu, 29 Sep 2022 12:14:49 +0200 Subject: [PATCH] QnxPlugin: Don't force validate each Kit The QNX Plugin did call kit->isValid() for every Kit, even if it is not a Qnx Kits. This patch turns the check around to first make sure that the Kit is a Qnx Kit, before validating it. Change-Id: I47bc20ffd1387deab3ab5ec3a56d9536b76d515f Reviewed-by: hjk --- src/plugins/qnx/qnxplugin.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 08932b1462b..0776064d208 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -160,11 +160,12 @@ void QnxPlugin::extensionsInitialized() void QnxPluginPrivate::updateDebuggerActions() { - const bool hasValidQnxKit = KitManager::kit([](const Kit *kit) { - return kit->isValid() - && DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE - && !DeviceKitAspect::device(kit).isNull(); - }) != nullptr; + auto isQnxKit = [](const Kit *kit) { + return DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE + && !DeviceKitAspect::device(kit).isNull() && kit->isValid(); + }; + + const bool hasValidQnxKit = KitManager::kit(isQnxKit) != nullptr; m_attachToQnxApplication.setVisible(hasValidQnxKit); m_debugSeparator->setVisible(hasValidQnxKit);