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>
This commit is contained in:
hjk
2023-02-22 11:32:10 +01:00
parent 55c2a55a60
commit 99b1cc5c24
4 changed files with 2 additions and 17 deletions

View File

@@ -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);

View File

@@ -47,7 +47,6 @@ public:
bool activate();
void deactivate();
bool isActive() const;
bool canCreateKits() const;
Utils::FilePath sdpPath() const;
QList<ProjectExplorer::ToolChain *> autoDetect(

View File

@@ -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

View File

@@ -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;