diff options
Diffstat (limited to 'src/plugins/qnx/qnxbaseconfiguration.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxbaseconfiguration.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/plugins/qnx/qnxbaseconfiguration.cpp b/src/plugins/qnx/qnxbaseconfiguration.cpp index 4efcf0002c..e34f507626 100644 --- a/src/plugins/qnx/qnxbaseconfiguration.cpp +++ b/src/plugins/qnx/qnxbaseconfiguration.cpp @@ -146,16 +146,17 @@ void QnxBaseConfiguration::ctor(const FileName &envScript) m_qnxHost = Utils::FileName::fromString(item.value); } - FileName qccPath = QnxUtils::executableWithExtension( - FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/qcc"))); - FileName armlev7GdbPath = QnxUtils::executableWithExtension( - FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb"))); - if (!armlev7GdbPath.toFileInfo().exists()) - armlev7GdbPath = QnxUtils::executableWithExtension( - FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb"))); - - FileName x86GdbPath = QnxUtils::executableWithExtension( - FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb"))); + FileName qccPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( + m_qnxHost.toString() + QLatin1String("/usr/bin/qcc"))); + FileName armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( + m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb"))); + if (!armlev7GdbPath.toFileInfo().exists()) { + armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( + m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb"))); + } + + FileName x86GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix( + m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb"))); if (qccPath.toFileInfo().exists()) m_qccCompiler = qccPath; |