ProjectExplorer: Fix UI of various kit aspects

... when there is no value compatible with the current build device.
The combo box was missing the "none" entry in that case.
Amends db11237.

Task-number: QTCREATORBUG-26870
Change-Id: I195b13026ac299d57287772040c1fc78ab9289d2
Reviewed-by: hjk <[email protected]>

Author: ckandeler

src/plugins/cmakeprojectmanager/cmakekitaspect.cpp

@@ -80,16 +80,15 @@ class CMakeToolListModel : public TreeModel<TreeItem, Internal::CMakeToolTreeIte
     {
         clear();
 
-        const IDevice::ConstPtr dev = BuildDeviceKitAspect::device(&m_kit);
-        if (!dev)
-            return;
-        const FilePath rootPath = dev->rootPath();
-        const QList<CMakeTool *> toolsForBuildDevice
-            = Utils::filtered(CMakeToolManager::cmakeTools(), [rootPath](CMakeTool *item) {
-                  return item->cmakeExecutable().isSameDevice(rootPath);
-              });
-        for (CMakeTool *item : toolsForBuildDevice)
-            rootItem()->appendChild(new CMakeToolTreeItem(item, false));
+        if (const IDevice::ConstPtr dev = BuildDeviceKitAspect::device(&m_kit)) {
+            const FilePath rootPath = dev->rootPath();
+            const QList<CMakeTool *> toolsForBuildDevice
+                = Utils::filtered(CMakeToolManager::cmakeTools(), [rootPath](CMakeTool *item) {
+                      return item->cmakeExecutable().isSameDevice(rootPath);
+                  });
+            for (CMakeTool *item : toolsForBuildDevice)
+                rootItem()->appendChild(new CMakeToolTreeItem(item, false));
+        }
         rootItem()->appendChild(new CMakeToolTreeItem); // The "none" item.
     }
 

src/plugins/debugger/debuggerkitaspect.cpp

@@ -48,18 +48,17 @@ class DebuggerItemListModel : public TreeModel<TreeItem, DebuggerTreeItem>
     {
         clear();
 
-        const IDeviceConstPtr device = BuildDeviceKitAspect::device(&m_kit);
-        if (!device)
-            return;
-        const Utils::FilePath rootPath = device->rootPath();
-        const QList<DebuggerItem> debuggersForBuildDevice
-            = Utils::filtered(DebuggerItemManager::debuggers(), [&](const DebuggerItem &item) {
-                  if (item.isGeneric())
-                      return device->id() != ProjectExplorer::Constants::DESKTOP_DEVICE_ID;
-                  return item.command().isSameDevice(rootPath);
-              });
-        for (const DebuggerItem &item : debuggersForBuildDevice)
-            rootItem()->appendChild(new DebuggerTreeItem(item, false));
+        if (const IDeviceConstPtr device = BuildDeviceKitAspect::device(&m_kit)) {
+            const Utils::FilePath rootPath = device->rootPath();
+            const QList<DebuggerItem> debuggersForBuildDevice
+                = Utils::filtered(DebuggerItemManager::debuggers(), [&](const DebuggerItem &item) {
+                      if (item.isGeneric())
+                          return device->id() != ProjectExplorer::Constants::DESKTOP_DEVICE_ID;
+                      return item.command().isSameDevice(rootPath);
+                  });
+            for (const DebuggerItem &item : debuggersForBuildDevice)
+                rootItem()->appendChild(new DebuggerTreeItem(item, false));
+        }
         DebuggerItem noneItem;
         noneItem.setUnexpandedDisplayName(Tr::tr("None"));
         rootItem()->appendChild(new DebuggerTreeItem(noneItem, false));

src/plugins/projectexplorer/kitaspect.cpp

@@ -164,7 +164,10 @@ void KitAspect::refresh()
         la.spec.resetModel();
         la.comboBox->model()->sort(0);
         const QVariant itemId = la.spec.getter(*kit());
-        la.comboBox->setCurrentIndex(la.comboBox->findData(itemId, IdRole));
+        int idx = la.comboBox->findData(itemId, IdRole);
+        if (idx == -1)
+            idx = la.comboBox->count() - 1;
+        la.comboBox->setCurrentIndex(idx);
         la.comboBox->setEnabled(!d->readOnly && la.comboBox->count() > 1);
     }
 }

src/plugins/projectexplorer/toolchainkitaspect.cpp

@@ -40,20 +40,18 @@ class ToolchainListModel : public TreeModel<ToolchainTreeItem>
     {
         clear();
 
-        const Toolchains ltcList = ToolchainManager::toolchains(
-            [this](const Toolchain *tc) { return m_category.contains(tc->language()); });
-        IDeviceConstPtr device = BuildDeviceKitAspect::device(&m_kit);
-        if (!device)
-            return;
-
-        const QList<Toolchain *> toolchainsForBuildDevice
-            = Utils::filtered(ltcList, [device](Toolchain *tc) {
-                  return tc->compilerCommand().isSameDevice(device->rootPath());
-              });
-        const QList<ToolchainBundle> bundlesForBuildDevice = ToolchainBundle::collectBundles(
-            toolchainsForBuildDevice, ToolchainBundle::HandleMissing::CreateAndRegister);
-        for (const ToolchainBundle &b : bundlesForBuildDevice)
-            rootItem()->appendChild(new ToolchainTreeItem(b));
+        if (const IDeviceConstPtr device = BuildDeviceKitAspect::device(&m_kit)) {
+            const Toolchains ltcList = ToolchainManager::toolchains(
+                [this](const Toolchain *tc) { return m_category.contains(tc->language()); });
+            const Toolchains toolchainsForBuildDevice
+                = Utils::filtered(ltcList, [device](Toolchain *tc) {
+                      return tc->compilerCommand().isSameDevice(device->rootPath());
+                  });
+            const QList<ToolchainBundle> bundlesForBuildDevice = ToolchainBundle::collectBundles(
+                toolchainsForBuildDevice, ToolchainBundle::HandleMissing::CreateAndRegister);
+            for (const ToolchainBundle &b : bundlesForBuildDevice)
+                rootItem()->appendChild(new ToolchainTreeItem(b));
+        }
         rootItem()->appendChild(new ToolchainTreeItem);
     }
 

src/plugins/qtsupport/qtkitaspect.cpp

@@ -49,16 +49,15 @@ class QtVersionListModel : public TreeModel<TreeItem, QtVersionItem>
     {
         clear();
 
-        const IDevice::ConstPtr device = BuildDeviceKitAspect::device(&m_kit);
-        if (!device)
-            return;
-        const FilePath deviceRoot = device->rootPath();
-        const QtVersions versionsForBuildDevice = QtVersionManager::versions(
-            [&deviceRoot](const QtVersion *qt) {
-                return qt->qmakeFilePath().isSameDevice(deviceRoot);
-            });
-        for (QtVersion *v : versionsForBuildDevice)
-            rootItem()->appendChild(new QtVersionItem(v->uniqueId()));
+        if (const IDevice::ConstPtr device = BuildDeviceKitAspect::device(&m_kit)) {
+            const FilePath deviceRoot = device->rootPath();
+            const QtVersions versionsForBuildDevice = QtVersionManager::versions(
+                [&deviceRoot](const QtVersion *qt) {
+                    return qt->qmakeFilePath().isSameDevice(deviceRoot);
+                });
+            for (QtVersion *v : versionsForBuildDevice)
+                rootItem()->appendChild(new QtVersionItem(v->uniqueId()));
+        }
         rootItem()->appendChild(new QtVersionItem(-1)); // The "No Qt" entry.
     }