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 QnxConfiguration::findToolChain(const QList &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 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()); // 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 -#include #include #include #include #include -#include #include using namespace ProjectExplorer;