feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QnxPlugin: Don't force validate each Kit

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-09-29 12:14:49 +02:00
parent a254a9ba54
commit d093a7b69d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qnx/qnxplugin.cpp
View File

@@ -160,11 +160,12 @@ void QnxPlugin::extensionsInitialized()
void QnxPluginPrivate::updateDebuggerActions() void QnxPluginPrivate::updateDebuggerActions()
{ {
const bool hasValidQnxKit = KitManager::kit([](const Kit *kit) { auto isQnxKit = [](const Kit *kit) {
return kit->isValid() return DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
&& DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE && !DeviceKitAspect::device(kit).isNull() && kit->isValid();
&& !DeviceKitAspect::device(kit).isNull(); };
}) != nullptr;
const bool hasValidQnxKit = KitManager::kit(isQnxKit) != nullptr;
m_attachToQnxApplication.setVisible(hasValidQnxKit); m_attachToQnxApplication.setVisible(hasValidQnxKit);
m_debugSeparator->setVisible(hasValidQnxKit); m_debugSeparator->setVisible(hasValidQnxKit);