diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp index 397c82ab942..9125b07a62b 100644 --- a/src/plugins/qnx/blackberryconfiguration.cpp +++ b/src/plugins/qnx/blackberryconfiguration.cpp @@ -73,27 +73,27 @@ BlackBerryConfiguration::BlackBerryConfiguration(const FileName &ndkEnvFile, boo m_qnxEnv = QnxUtils::qnxEnvironmentFromNdkFile(m_ndkEnvFile.toString()); QString ndkTarget; - QString qnxHost; foreach (const Utils::EnvironmentItem &item, m_qnxEnv) { if (item.name == QLatin1String("QNX_TARGET")) ndkTarget = item.value; else if (item.name == QLatin1String("QNX_HOST")) - qnxHost = item.value; + m_qnxHost = item.value; } - QString sep = QString::fromLatin1("%1qnx6").arg(QDir::separator()); - m_targetName = ndkTarget.split(sep).first().split(QDir::separator()).last(); + // The QNX_TARGET value is using Unix-like separator on all platforms. + QString sep = QString::fromLatin1("/qnx6"); + m_targetName = ndkTarget.split(sep).first().split(QLatin1Char('/')).last(); if (QDir(ndkTarget).exists()) m_sysRoot = FileName::fromString(ndkTarget); - FileName qmake4Path = QnxUtils::executableWithExtension(FileName::fromString(qnxHost + QLatin1String("/usr/bin/qmake"))); - FileName qmake5Path = QnxUtils::executableWithExtension(FileName::fromString(qnxHost + QLatin1String("/usr/bin/qt5/qmake"))); - FileName gccPath = QnxUtils::executableWithExtension(FileName::fromString(qnxHost + QLatin1String("/usr/bin/qcc"))); - FileName deviceGdbPath = QnxUtils::executableWithExtension(FileName::fromString(qnxHost + QLatin1String("/usr/bin/ntoarm-gdb"))); - FileName simulatorGdbPath = QnxUtils::executableWithExtension(FileName::fromString(qnxHost + QLatin1String("/usr/bin/ntox86-gdb"))); + FileName qmake4Path = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qmake"))); + FileName qmake5Path = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qt5/qmake"))); + FileName gccPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qcc"))); + FileName deviceGdbPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/ntoarm-gdb"))); + FileName simulatorGdbPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/ntox86-gdb"))); if (qmake4Path.toFileInfo().exists()) m_qmake4BinaryFile = qmake4Path; @@ -126,6 +126,11 @@ QString BlackBerryConfiguration::targetName() const return m_targetName; } +QString BlackBerryConfiguration::qnxHost() const +{ + return m_qnxHost; +} + bool BlackBerryConfiguration::isAutoDetected() const { return m_isAutoDetected; diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h index 51473a5b0aa..1b31d186b31 100644 --- a/src/plugins/qnx/blackberryconfiguration.h +++ b/src/plugins/qnx/blackberryconfiguration.h @@ -66,6 +66,7 @@ public: QString ndkPath() const; QString displayName() const; QString targetName() const; + QString qnxHost() const; bool isAutoDetected() const; bool isActive() const; bool isValid() const; @@ -81,6 +82,7 @@ public: private: QString m_displayName; QString m_targetName; + QString m_qnxHost; bool m_isAutoDetected; Utils::FileName m_ndkEnvFile; Utils::FileName m_qmake4BinaryFile; diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index 9ca62b4aa68..a1982539e7e 100644 --- a/src/plugins/qnx/blackberryndksettingswidget.cpp +++ b/src/plugins/qnx/blackberryndksettingswidget.cpp @@ -144,15 +144,18 @@ void BlackBerryNDKSettingsWidget::updateInfoTable(QTreeWidgetItem* currentItem) if (!config) return; - foreach (const NdkInstallInformation &ndkInfo, QnxUtils::installedNdks()) - { - if (ndkInfo.name == config->displayName()) { - m_ui->baseNameLabel->setText(ndkInfo.name); - m_ui->ndkPathLabel->setText(ndkInfo.path); - m_ui->versionLabel->setText(ndkInfo.version); - m_ui->hostLabel->setText(ndkInfo.host); - m_ui->targetLabel->setText(ndkInfo.target); - break; + m_ui->baseNameLabel->setText(config->displayName()); + m_ui->ndkPathLabel->setText(QDir::toNativeSeparators(config->ndkPath())); + m_ui->hostLabel->setText(QDir::toNativeSeparators(config->qnxHost())); + m_ui->targetLabel->setText(QDir::toNativeSeparators(config->sysRoot().toString())); + m_ui->versionLabel->clear(); + // TODO: Add a versionNumber attribute for the BlackBerryConfiguration class + if (config->isAutoDetected()) { + foreach (const NdkInstallInformation &ndkInfo, QnxUtils::installedNdks()) { + if (ndkInfo.name == config->displayName()) { + m_ui->versionLabel->setText(ndkInfo.version); + break; + } } }