From 99b1cc5c2494e56c740bf1d8665a5bf750a25f39 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 22 Feb 2023 11:32:10 +0100
Subject: [PATCH] Qnx: Allow broader kit generation

So far we insisted on a Qt version being present. For more general
use, including limited testing it's more convenient to also allow
kits being generated when no QNX Qt is around.

Change-Id: I99954b76543f2a04063a737444dce0ae5c921929
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qnx/qnxconfiguration.cpp | 14 +-------------
 src/plugins/qnx/qnxconfiguration.h   |  1 -
 src/plugins/qnx/qnxsettingspage.cpp  |  2 +-
 src/plugins/qnx/qnxutils.cpp         |  2 --
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index bb3e97995ae..c3ec91d1f48 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -176,15 +176,6 @@ bool QnxConfiguration::isActive() const
     return hasToolChain && hasDebugger;
 }
 
-bool QnxConfiguration::canCreateKits() const
-{
-    if (!isValid())
-        return false;
-
-    return Utils::anyOf(m_targets,
-                        [this](const Target &target) -> bool { return qnxQtVersion(target); });
-}
-
 FilePath QnxConfiguration::sdpPath() const
 {
     return envFile().parentDir();
@@ -276,10 +267,7 @@ QList<ToolChain *> QnxConfiguration::findToolChain(const QList<ToolChain *> &alr
 void QnxConfiguration::createKit(const Target &target, const QnxToolChainMap &toolChainMap,
                                  const QVariant &debugger)
 {
-    QnxQtVersion *qnxQt = qnxQtVersion(target);
-    // Do not create incomplete kits if no qt qnx version found
-    if (!qnxQt)
-        return;
+    QnxQtVersion *qnxQt = qnxQtVersion(target); // nullptr is ok.
 
     const auto init = [&](Kit *k) {
         QtKitAspect::setQtVersion(k, qnxQt);
diff --git a/src/plugins/qnx/qnxconfiguration.h b/src/plugins/qnx/qnxconfiguration.h
index 2876535b217..34056536c35 100644
--- a/src/plugins/qnx/qnxconfiguration.h
+++ b/src/plugins/qnx/qnxconfiguration.h
@@ -47,7 +47,6 @@ public:
     bool activate();
     void deactivate();
     bool isActive() const;
-    bool canCreateKits() const;
     Utils::FilePath sdpPath() const;
 
     QList<ProjectExplorer::ToolChain *> autoDetect(
diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp
index e809ca876f7..0d354037735 100644
--- a/src/plugins/qnx/qnxsettingspage.cpp
+++ b/src/plugins/qnx/qnxsettingspage.cpp
@@ -183,7 +183,7 @@ void QnxSettingsWidget::updateInformation()
             m_configsCombo->itemData(currentIndex).value<void*>());
 
     // update the checkbox
-    m_generateKitsCheckBox->setEnabled(config ? config->canCreateKits() : false);
+    m_generateKitsCheckBox->setEnabled(config ? config->isValid() : false);
     m_generateKitsCheckBox->setChecked(config ? config->isActive() : false);
 
     // update information
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 4e315b95a15..697e95bebc6 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -4,13 +4,11 @@
 #include "qnxutils.h"
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
 #include <utils/temporaryfile.h>
 
 #include <QDebug>
-#include <QStandardPaths>
 #include <QApplication>
 
 using namespace ProjectExplorer;