diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index 9b5ff20881a..3d3a09df7b1 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -354,7 +354,7 @@ void QnxConfiguration::setVersion(const QnxVersionNumber &version) void QnxConfiguration::readInformation() { - QString qConfigPath = FileName(m_qnxConfiguration).appendPath("qconfig").toString(); + const QString qConfigPath = m_qnxConfiguration.pathAppended("qconfig").toString(); QList installInfoList = QnxUtils::installedConfigs(qConfigPath); if (installInfoList.isEmpty()) return; @@ -418,13 +418,13 @@ void QnxConfiguration::updateTargets() void QnxConfiguration::assignDebuggersToTargets() { - QDir hostUsrBinDir(FileName(m_qnxHost).appendPath("usr/bin").toString()); + const QDir hostUsrBinDir(m_qnxHost.pathAppended("usr/bin").toString()); QStringList debuggerNames = hostUsrBinDir.entryList( QStringList(HostOsInfo::withExecutableSuffix(QLatin1String("nto*-gdb"))), QDir::Files); foreach (const QString &debuggerName, debuggerNames) { - FileName debuggerPath = FileName::fromString(hostUsrBinDir.path()) - .appendPath(debuggerName); + const FileName debuggerPath = FileName::fromString(hostUsrBinDir.path()) + .pathAppended(debuggerName); DebuggerItem item; item.setCommand(debuggerPath); item.reinitializeFromFile(); diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index 8178c33f095..0bfb4dedd89 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -219,7 +219,7 @@ QList QnxUtils::findTargets(const Utils::FileName &basePath) QDirIterator iterator(basePath.toString()); while (iterator.hasNext()) { iterator.next(); - FileName libc = FileName::fromString(iterator.filePath()).appendPath("lib/libc.so"); + const FileName libc = FileName::fromString(iterator.filePath()).pathAppended("lib/libc.so"); if (libc.exists()) { auto abis = Abi::abisOfBinary(libc); if (abis.isEmpty()) { diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index e2e62634168..7316994a801 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -444,12 +444,10 @@ FileName BaseQtVersion::binPath() const FileName BaseQtVersion::mkspecsPath() const { - FileName result = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA")); + const FileName result = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA")); if (result.isEmpty()) - result = FileName::fromUserInput(qmakeProperty("QMAKE_MKSPECS")); - else - result.appendPath("mkspecs"); - return result; + return FileName::fromUserInput(qmakeProperty("QMAKE_MKSPECS")); + return result.pathAppended("mkspecs"); } FileName BaseQtVersion::qmlBinPath() const @@ -906,7 +904,7 @@ void BaseQtVersion::updateMkspec() const m_mkspec = m_mkspec.relativeChildPath(baseMkspecDir); // qDebug() << "Setting mkspec to"<