Qnx/Qmake: More FileName::appendPath -> pathAppended changes

Change-Id: Ibd6639ff83ec922fade7de4115d1e777e496f3e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

2 files changed, 8 insertions, 10 deletions

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"<<mkspec;
     } else {
-        FileName sourceMkSpecPath = sourcePath().appendPath("mkspecs");
+        const FileName sourceMkSpecPath = sourcePath().pathAppended("mkspecs");
         if (m_mkspec.isChildOf(sourceMkSpecPath)) {
             m_mkspec = m_mkspec.relativeChildPath(sourceMkSpecPath);
         } else {
@@ -1819,8 +1817,8 @@ FileNameList BaseQtVersion::qtCorePaths() const
                 && file.startsWith("QtCore")
                 && file.endsWith(".framework")) {
             // handle Framework
-            FileName lib = FileName::fromFileInfo(info);
-            dynamicLibs.append(lib.appendPath(file.left(file.lastIndexOf('.'))));
+            const FileName lib = FileName::fromFileInfo(info);
+            dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.'))));
         } else if (info.isReadable()) {
             if (file.startsWith("libQtCore")
                     || file.startsWith("libQt5Core")
diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp
index 30292b11ee7..c3d23cb5bfb 100644
--- a/src/plugins/qtsupport/desktopqtversion.cpp
+++ b/src/plugins/qtsupport/desktopqtversion.cpp
@@ -94,8 +94,8 @@ QString DesktopQtVersion::qmlsceneCommand() const
 
     ensureMkSpecParsed();
 
-    QString path =
-        qmlBinPath().appendPath(Utils::HostOsInfo::withExecutableSuffix("qmlscene")).toString();
+    const QString path =
+        qmlBinPath().pathAppended(Utils::HostOsInfo::withExecutableSuffix("qmlscene")).toString();
 
     m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString();