Utils: Rename FileName to FilePath

More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

17 files changed, 196 insertions, 196 deletions

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 440d042bc0..2dd4160a3b 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -199,7 +199,7 @@ BaseQtVersion::BaseQtVersion() = default;
 
 BaseQtVersion::~BaseQtVersion() = default;
 
-void BaseQtVersion::setupQmakePathAndId(const FileName &qmakeCommand)
+void BaseQtVersion::setupQmakePathAndId(const FilePath &qmakeCommand)
 {
     m_id = QtVersionManager::getUniqueId();
     QTC_CHECK(m_qmakeCommand.isEmpty()); // Should only be used once.
@@ -207,7 +207,7 @@ void BaseQtVersion::setupQmakePathAndId(const FileName &qmakeCommand)
     setUnexpandedDisplayName(defaultUnexpandedDisplayName(m_qmakeCommand, false));
 }
 
-QString BaseQtVersion::defaultUnexpandedDisplayName(const FileName &qmakePath, bool fromPath)
+QString BaseQtVersion::defaultUnexpandedDisplayName(const FilePath &qmakePath, bool fromPath)
 {
     QString location;
     if (qmakePath.isEmpty()) {
@@ -369,7 +369,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
         result << Task(Task::Warning,
                        QCoreApplication::translate("BaseQtVersion",
                                                    "Device type is not supported by Qt version."),
-                       FileName(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
+                       FilePath(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
     }
 
     ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
@@ -400,74 +400,74 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
                                                       "The compiler \"%1\" (%2) may not produce code compatible with the Qt version \"%3\" (%4).");
             message = message.arg(tc->displayName(), targetAbi.toString(),
                                   version->displayName(), qtAbiString);
-            result << Task(fuzzyMatch ? Task::Warning : Task::Error, message, FileName(), -1,
+            result << Task(fuzzyMatch ? Task::Warning : Task::Error, message, FilePath(), -1,
                            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
         }
     } else if (ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID)) {
         const QString message = QCoreApplication::translate("BaseQtVersion",
             "The kit has a Qt version, but no C++ compiler.");
-        result << Task(Task::Warning, message, FileName(), -1,
+        result << Task(Task::Warning, message, FilePath(), -1,
                        ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
     }
     return result;
 }
 
-FileName BaseQtVersion::headerPath() const
+FilePath BaseQtVersion::headerPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_INSTALL_HEADERS"));
+    return FilePath::fromUserInput(qmakeProperty("QT_INSTALL_HEADERS"));
 }
 
-FileName BaseQtVersion::docsPath() const
+FilePath BaseQtVersion::docsPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_INSTALL_DOCS"));
+    return FilePath::fromUserInput(qmakeProperty("QT_INSTALL_DOCS"));
 }
 
-FileName BaseQtVersion::libraryPath() const
+FilePath BaseQtVersion::libraryPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_INSTALL_LIBS"));
+    return FilePath::fromUserInput(qmakeProperty("QT_INSTALL_LIBS"));
 }
 
-FileName BaseQtVersion::pluginPath() const
+FilePath BaseQtVersion::pluginPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_INSTALL_PLUGINS"));
+    return FilePath::fromUserInput(qmakeProperty("QT_INSTALL_PLUGINS"));
 }
 
-FileName BaseQtVersion::qmlPath() const
+FilePath BaseQtVersion::qmlPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_INSTALL_QML"));
+    return FilePath::fromUserInput(qmakeProperty("QT_INSTALL_QML"));
 }
 
-FileName BaseQtVersion::binPath() const
+FilePath BaseQtVersion::binPath() const
 {
-    return FileName::fromUserInput(qmakeProperty("QT_HOST_BINS"));
+    return FilePath::fromUserInput(qmakeProperty("QT_HOST_BINS"));
 }
 
-FileName BaseQtVersion::mkspecsPath() const
+FilePath BaseQtVersion::mkspecsPath() const
 {
-    const FileName result = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA"));
+    const FilePath result = FilePath::fromUserInput(qmakeProperty("QT_HOST_DATA"));
     if (result.isEmpty())
-        return FileName::fromUserInput(qmakeProperty("QMAKE_MKSPECS"));
+        return FilePath::fromUserInput(qmakeProperty("QMAKE_MKSPECS"));
     return result.pathAppended("mkspecs");
 }
 
-FileName BaseQtVersion::qmlBinPath() const
+FilePath BaseQtVersion::qmlBinPath() const
 {
-    return FileName::fromUserInput(m_mkspecValues.value("QT.qml.bins"));
+    return FilePath::fromUserInput(m_mkspecValues.value("QT.qml.bins"));
 }
 
-FileName BaseQtVersion::librarySearchPath() const
+FilePath BaseQtVersion::librarySearchPath() const
 {
     return HostOsInfo::isWindowsHost()
-            ? FileName::fromUserInput(qmakeProperty("QT_INSTALL_BINS")) : libraryPath();
+            ? FilePath::fromUserInput(qmakeProperty("QT_INSTALL_BINS")) : libraryPath();
 }
 
-FileNameList BaseQtVersion::directoriesToIgnoreInProjectTree() const
+FilePathList BaseQtVersion::directoriesToIgnoreInProjectTree() const
 {
-    FileNameList result;
-    const FileName mkspecPathGet = mkspecsPath();
+    FilePathList result;
+    const FilePath mkspecPathGet = mkspecsPath();
     result.append(mkspecPathGet);
 
-    FileName mkspecPathSrc = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA", PropertyVariantSrc));
+    FilePath mkspecPathSrc = FilePath::fromUserInput(qmakeProperty("QT_HOST_DATA", PropertyVariantSrc));
     if (!mkspecPathSrc.isEmpty()) {
         mkspecPathSrc = mkspecPathSrc.pathAppended("mkspecs");
         if (mkspecPathSrc != mkspecPathGet)
@@ -529,7 +529,7 @@ void BaseQtVersion::fromMap(const QVariantMap &map)
     if (string.startsWith('~'))
         string.remove(0, 1).prepend(QDir::homePath());
 
-    m_qtSources = Utils::FileName::fromUserInput(
+    m_qtSources = Utils::FilePath::fromUserInput(
                 map.value(QTVERSIONSOURCEPATH).toString());
 
     // Handle ABIs provided by the SDKTool:
@@ -546,7 +546,7 @@ void BaseQtVersion::fromMap(const QVariantMap &map)
         string = BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget());
     }
 
-    m_qmakeCommand = Utils::FileName::fromString(string);
+    m_qmakeCommand = Utils::FilePath::fromString(string);
 }
 
 QVariantMap BaseQtVersion::toMap() const
@@ -615,7 +615,7 @@ QStringList BaseQtVersion::warningReason() const
     return ret;
 }
 
-FileName BaseQtVersion::qmakeCommand() const
+FilePath BaseQtVersion::qmakeCommand() const
 {
     return m_qmakeCommand;
 }
@@ -772,7 +772,7 @@ QString BaseQtVersion::toHtml(bool verbose) const
     return rc;
 }
 
-FileName BaseQtVersion::sourcePath() const
+FilePath BaseQtVersion::sourcePath() const
 {
     if (m_sourcePath.isEmpty()) {
         updateVersionInfo();
@@ -781,7 +781,7 @@ FileName BaseQtVersion::sourcePath() const
     return m_sourcePath;
 }
 
-FileName BaseQtVersion::qtPackageSourcePath() const
+FilePath BaseQtVersion::qtPackageSourcePath() const
 {
     return m_qtSources;
 }
@@ -898,13 +898,13 @@ void BaseQtVersion::updateMkspec() const
     if (m_mkspecFullPath.isEmpty())
         return;
 
-    FileName baseMkspecDir = mkspecDirectoryFromVersionInfo(versionInfo());
+    FilePath baseMkspecDir = mkspecDirectoryFromVersionInfo(versionInfo());
 
     if (m_mkspec.isChildOf(baseMkspecDir)) {
         m_mkspec = m_mkspec.relativeChildPath(baseMkspecDir);
 //        qDebug() << "Setting mkspec to"<<mkspec;
     } else {
-        const FileName sourceMkSpecPath = sourcePath().pathAppended("mkspecs");
+        const FilePath sourceMkSpecPath = sourcePath().pathAppended("mkspecs");
         if (m_mkspec.isChildOf(sourceMkSpecPath)) {
             m_mkspec = m_mkspec.relativeChildPath(sourceMkSpecPath);
         } else {
@@ -989,7 +989,7 @@ QString BaseQtVersion::mkspecFor(ToolChain *tc) const
     return versionSpec;
 }
 
-FileName BaseQtVersion::mkspecPath() const
+FilePath BaseQtVersion::mkspecPath() const
 {
     updateMkspec();
     return m_mkspecFullPath;
@@ -1364,8 +1364,8 @@ void BaseQtVersion::populateQmlFileFinder(FileInProjectFinder *finder, const Tar
     const QList<ProjectExplorer::Project *> projects = ProjectExplorer::SessionManager::projects();
     QTC_CHECK(projects.isEmpty() || startupProject);
 
-    Utils::FileName projectDirectory;
-    Utils::FileNameList sourceFiles;
+    Utils::FilePath projectDirectory;
+    Utils::FilePathList sourceFiles;
 
     // Sort files from startupProject to the front of the list ...
     if (startupProject) {
@@ -1386,11 +1386,11 @@ void BaseQtVersion::populateQmlFileFinder(FileInProjectFinder *finder, const Tar
 
     // ... and find the sysroot and qml directory if we have any target at all.
     const ProjectExplorer::Kit *kit = target ? target->kit() : nullptr;
-    const Utils::FileName activeSysroot = ProjectExplorer::SysRootKitAspect::sysRoot(kit);
+    const Utils::FilePath activeSysroot = ProjectExplorer::SysRootKitAspect::sysRoot(kit);
     const QtSupport::BaseQtVersion *qtVersion = QtVersionManager::isLoaded()
             ? QtSupport::QtKitAspect::qtVersion(kit) : nullptr;
-    Utils::FileNameList additionalSearchDirectories = qtVersion
-            ? Utils::FileNameList({qtVersion->qmlPath()}) : Utils::FileNameList();
+    Utils::FilePathList additionalSearchDirectories = qtVersion
+            ? Utils::FilePathList({qtVersion->qmlPath()}) : Utils::FilePathList();
 
     if (target) {
         for (const ProjectExplorer::DeployableFile &file : target->deploymentData().allFiles())
@@ -1476,7 +1476,7 @@ Tasks BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &bui
     if (!isValid()) {
         //: %1: Reason for being invalid
         const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", "The Qt version is invalid: %1").arg(invalidReason());
-        results.append(Task(Task::Error, msg, FileName(), -1,
+        results.append(Task(Task::Error, msg, FilePath(), -1,
                             ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
     }
 
@@ -1486,7 +1486,7 @@ Tasks BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &bui
         //: %1: Path to qmake executable
         const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
                                                         "The qmake command \"%1\" was not found or is not executable.").arg(qmakeCommand().toUserOutput());
-        results.append(Task(Task::Error, msg, FileName(), -1,
+        results.append(Task(Task::Error, msg, FilePath(), -1,
                             ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
     }
 
@@ -1505,7 +1505,7 @@ QtConfigWidget *BaseQtVersion::createConfigurationWidget() const
     return nullptr;
 }
 
-static QByteArray runQmakeQuery(const FileName &binary, const Environment &env,
+static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env,
                                 QString *error)
 {
     QTC_ASSERT(error, return QByteArray());
@@ -1537,7 +1537,7 @@ static QByteArray runQmakeQuery(const FileName &binary, const Environment &env,
     return process.readAllStandardOutput();
 }
 
-bool BaseQtVersion::queryQMakeVariables(const FileName &binary, const Environment &env,
+bool BaseQtVersion::queryQMakeVariables(const FilePath &binary, const Environment &env,
                                         QHash<ProKey, ProString> *versionInfo, QString *error)
 {
     QString tmp;
@@ -1579,19 +1579,19 @@ bool BaseQtVersion::queryQMakeVariables(const FileName &binary, const Environmen
     return true;
 }
 
-FileName BaseQtVersion::mkspecDirectoryFromVersionInfo(const QHash<ProKey, ProString> &versionInfo)
+FilePath BaseQtVersion::mkspecDirectoryFromVersionInfo(const QHash<ProKey, ProString> &versionInfo)
 {
     QString dataDir = qmakeProperty(versionInfo, "QT_HOST_DATA", PropertyVariantSrc);
     if (dataDir.isEmpty())
-        return FileName();
-    return FileName::fromUserInput(dataDir + "/mkspecs");
+        return FilePath();
+    return FilePath::fromUserInput(dataDir + "/mkspecs");
 }
 
-FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &versionInfo)
+FilePath BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &versionInfo)
 {
-    FileName baseMkspecDir = mkspecDirectoryFromVersionInfo(versionInfo);
+    FilePath baseMkspecDir = mkspecDirectoryFromVersionInfo(versionInfo);
     if (baseMkspecDir.isEmpty())
-        return FileName();
+        return FilePath();
 
     bool qt5 = false;
     QString theSpec = qmakeProperty(versionInfo, "QMAKE_XSPEC");
@@ -1600,7 +1600,7 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &ve
     else
         qt5 = true;
 
-    FileName mkspecFullPath = baseMkspecDir.pathAppended(theSpec);
+    FilePath mkspecFullPath = baseMkspecDir.pathAppended(theSpec);
 
     // qDebug() << "default mkspec is located at" << mkspecFullPath;
 
@@ -1625,7 +1625,7 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &ve
                             // We sometimes get a mix of different slash styles here...
                             possibleFullPath = possibleFullPath.replace('\\', '/');
                             if (QFileInfo::exists(possibleFullPath)) // Only if the path exists
-                                mkspecFullPath = FileName::fromUserInput(possibleFullPath);
+                                mkspecFullPath = FilePath::fromUserInput(possibleFullPath);
                         }
                         break;
                     }
@@ -1659,18 +1659,18 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &ve
             //resolve mkspec link
             QString rspec = mkspecFullPath.toFileInfo().symLinkTarget();
             if (!rspec.isEmpty())
-                mkspecFullPath = FileName::fromUserInput(
+                mkspecFullPath = FilePath::fromUserInput(
                             QDir(baseMkspecDir.toString()).absoluteFilePath(rspec));
         }
     }
     return mkspecFullPath;
 }
 
-FileName BaseQtVersion::sourcePath(const QHash<ProKey, ProString> &versionInfo)
+FilePath BaseQtVersion::sourcePath(const QHash<ProKey, ProString> &versionInfo)
 {
     const QString qt5Source = qmakeProperty(versionInfo, "QT_INSTALL_PREFIX/src");
     if (!qt5Source.isEmpty())
-        return Utils::FileName::fromString(QFileInfo(qt5Source).canonicalFilePath());
+        return Utils::FilePath::fromString(QFileInfo(qt5Source).canonicalFilePath());
 
     const QString installData = qmakeProperty(versionInfo, "QT_INSTALL_PREFIX");
     QString sourcePath = installData;
@@ -1689,12 +1689,12 @@ FileName BaseQtVersion::sourcePath(const QHash<ProKey, ProString> &versionInfo)
             }
         }
     }
-    return FileName::fromUserInput(QFileInfo(sourcePath).canonicalFilePath());
+    return FilePath::fromUserInput(QFileInfo(sourcePath).canonicalFilePath());
 }
 
-bool BaseQtVersion::isInSourceDirectory(const Utils::FileName &filePath)
+bool BaseQtVersion::isInSourceDirectory(const Utils::FilePath &filePath)
 {
-    const Utils::FileName &source = sourcePath();
+    const Utils::FilePath &source = sourcePath();
     if (source.isEmpty())
         return false;
     QDir dir = QDir(source.toString());
@@ -1703,9 +1703,9 @@ bool BaseQtVersion::isInSourceDirectory(const Utils::FileName &filePath)
     return filePath.isChildOf(dir);
 }
 
-bool BaseQtVersion::isSubProject(const Utils::FileName &filePath) const
+bool BaseQtVersion::isSubProject(const Utils::FilePath &filePath) const
 {
-    const Utils::FileName &source = sourcePath();
+    const Utils::FilePath &source = sourcePath();
     if (!source.isEmpty()) {
         QDir dir = QDir(source.toString());
         if (dir.dirName() == "qtbase")
@@ -1791,7 +1791,7 @@ bool BaseQtVersion::isQtQuickCompilerSupported(QString *reason) const
     return true;
 }
 
-FileNameList BaseQtVersion::qtCorePaths() const
+FilePathList BaseQtVersion::qtCorePaths() const
 {
     updateVersionInfo();
     const QString &versionString = m_qtVersionString;
@@ -1809,15 +1809,15 @@ FileNameList BaseQtVersion::qtCorePaths() const
             result += QDir(installBinDir).entryInfoList(filters);
         return result;
     }();
-    FileNameList staticLibs;
-    FileNameList dynamicLibs;
+    FilePathList staticLibs;
+    FilePathList dynamicLibs;
     for (const QFileInfo &info : entryInfoList) {
         const QString file = info.fileName();
         if (info.isDir()
                 && file.startsWith("QtCore")
                 && file.endsWith(".framework")) {
             // handle Framework
-            const FileName lib = FileName::fromFileInfo(info);
+            const FilePath lib = FilePath::fromFileInfo(info);
             dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.'))));
         } else if (info.isReadable()) {
             if (file.startsWith("libQtCore")
@@ -1825,12 +1825,12 @@ FileNameList BaseQtVersion::qtCorePaths() const
                     || file.startsWith("QtCore")
                     || file.startsWith("Qt5Core")) {
                 if (file.endsWith(".a") || file.endsWith(".lib"))
-                    staticLibs.append(FileName::fromFileInfo(info));
+                    staticLibs.append(FilePath::fromFileInfo(info));
                 else if (file.endsWith(".dll")
                          || file.endsWith(QString::fromLatin1(".so.") + versionString)
                          || file.endsWith(".so")
                          || file.endsWith(QLatin1Char('.') + versionString + ".dylib"))
-                    dynamicLibs.append(FileName::fromFileInfo(info));
+                    dynamicLibs.append(FilePath::fromFileInfo(info));
             }
         }
     }
@@ -1840,7 +1840,7 @@ FileNameList BaseQtVersion::qtCorePaths() const
     return dynamicLibs;
 }
 
-static QByteArray scanQtBinaryForBuildString(const FileName &library)
+static QByteArray scanQtBinaryForBuildString(const FilePath &library)
 {
     QFile lib(library.toString());
     QByteArray buildString;
@@ -1993,10 +1993,10 @@ static Abi refineAbiFromBuildString(const QByteArray &buildString, const Abi &pr
     return Abi(arch, os, flavor, format, wordWidth);
 }
 
-static Abi scanQtBinaryForBuildStringAndRefineAbi(const FileName &library,
+static Abi scanQtBinaryForBuildStringAndRefineAbi(const FilePath &library,
                                                    const Abi &probableAbi)
 {
-    static QHash<Utils::FileName, Abi> results;
+    static QHash<Utils::FilePath, Abi> results;
 
     if (!results.contains(library)) {
         const QByteArray buildString = scanQtBinaryForBuildString(library);
@@ -2005,10 +2005,10 @@ static Abi scanQtBinaryForBuildStringAndRefineAbi(const FileName &library,
     return results.value(library);
 }
 
-Abis BaseQtVersion::qtAbisFromLibrary(const FileNameList &coreLibraries)
+Abis BaseQtVersion::qtAbisFromLibrary(const FilePathList &coreLibraries)
 {
     Abis res;
-    for (const FileName &library : coreLibraries) {
+    for (const FilePath &library : coreLibraries) {
         for (Abi abi : Abi::abisOfBinary(library)) {
             Abi tmp = abi;
             if (abi.osFlavor() == Abi::UnknownFlavor)
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index e088b3953a..34e33b1c20 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -148,11 +148,11 @@ public:
     virtual Utils::Environment qmakeRunEnvironment() const;
 
     // source path defined by qmake property QT_INSTALL_PREFIX/src or by qmake.stash QT_SOURCE_TREE
-    Utils::FileName sourcePath() const;
+    Utils::FilePath sourcePath() const;
     // returns source path for installed qt packages and empty string for self build qt
-    Utils::FileName qtPackageSourcePath() const;
-    bool isInSourceDirectory(const Utils::FileName &filePath);
-    bool isSubProject(const Utils::FileName &filePath) const;
+    Utils::FilePath qtPackageSourcePath() const;
+    bool isInSourceDirectory(const Utils::FilePath &filePath);
+    bool isSubProject(const Utils::FilePath &filePath) const;
 
     // used by UiCodeModelSupport
     QString uicCommand() const;
@@ -175,14 +175,14 @@ public:
     QString frameworkInstallPath() const;
 
     // former local functions
-    Utils::FileName qmakeCommand() const;
+    Utils::FilePath qmakeCommand() const;
 
     /// @returns the name of the mkspec
     QString mkspec() const;
     QString mkspecFor(ProjectExplorer::ToolChain *tc) const;
     /// @returns the full path to the default directory
     /// specifally not the directory the symlink/ORIGINAL_QMAKESPEC points to
-    Utils::FileName mkspecPath() const;
+    Utils::FilePath mkspecPath() const;
 
     bool hasMkspec(const QString &spec) const;
 
@@ -216,24 +216,24 @@ public:
 
     virtual QtConfigWidget *createConfigurationWidget() const;
 
-    static QString defaultUnexpandedDisplayName(const Utils::FileName &qmakePath,
+    static QString defaultUnexpandedDisplayName(const Utils::FilePath &qmakePath,
                                       bool fromPath = false);
 
     virtual QSet<Core::Id> targetDeviceTypes() const = 0;
 
     virtual ProjectExplorer::Tasks validateKit(const ProjectExplorer::Kit *k);
 
-    Utils::FileName headerPath() const;
-    Utils::FileName docsPath() const;
-    Utils::FileName libraryPath() const;
-    Utils::FileName pluginPath() const;
-    Utils::FileName qmlPath() const;
-    Utils::FileName binPath() const;
-    Utils::FileName mkspecsPath() const;
-    Utils::FileName qmlBinPath() const;
-    Utils::FileName librarySearchPath() const;
+    Utils::FilePath headerPath() const;
+    Utils::FilePath docsPath() const;
+    Utils::FilePath libraryPath() const;
+    Utils::FilePath pluginPath() const;
+    Utils::FilePath qmlPath() const;
+    Utils::FilePath binPath() const;
+    Utils::FilePath mkspecsPath() const;
+    Utils::FilePath qmlBinPath() const;
+    Utils::FilePath librarySearchPath() const;
 
-    Utils::FileNameList directoriesToIgnoreInProjectTree() const;
+    Utils::FilePathList directoriesToIgnoreInProjectTree() const;
 
     QString qtNamespace() const;
     QString qtLibInfix() const;
@@ -264,30 +264,30 @@ protected:
     virtual ProjectExplorer::Tasks reportIssuesImpl(const QString &proFile, const QString &buildDir) const;
 
     // helper function for desktop and simulator to figure out the supported abis based on the libraries
-    Utils::FileNameList qtCorePaths() const;
-    static ProjectExplorer::Abis qtAbisFromLibrary(const Utils::FileNameList &coreLibraries);
+    Utils::FilePathList qtCorePaths() const;
+    static ProjectExplorer::Abis qtAbisFromLibrary(const Utils::FilePathList &coreLibraries);
 
     void ensureMkSpecParsed() const;
     virtual void parseMkSpec(ProFileEvaluator *) const;
 
 private:
-    void setupQmakePathAndId(const Utils::FileName &path);
+    void setupQmakePathAndId(const Utils::FilePath &path);
     void setAutoDetectionSource(const QString &autodetectionSource);
     void updateVersionInfo() const;
     enum HostBinaries { Designer, Linguist, Uic, QScxmlc };
     QString findHostBinary(HostBinaries binary) const;
     void updateMkspec() const;
     QHash<ProKey, ProString> versionInfo() const;
-    static bool queryQMakeVariables(const Utils::FileName &binary,
+    static bool queryQMakeVariables(const Utils::FilePath &binary,
                                     const Utils::Environment &env,
                                     QHash<ProKey, ProString> *versionInfo,
                                     QString *error = nullptr);
     static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo,
                                  const QByteArray &name,
                                  PropertyVariant variant = PropertyVariantGet);
-    static Utils::FileName mkspecDirectoryFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);
-    static Utils::FileName mkspecFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);
-    static Utils::FileName sourcePath(const QHash<ProKey,ProString> &versionInfo);
+    static Utils::FilePath mkspecDirectoryFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);
+    static Utils::FilePath mkspecFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);
+    static Utils::FilePath sourcePath(const QHash<ProKey,ProString> &versionInfo);
     void setId(int id); // used by the qtversionmanager for legacy restore
                         // and by the qtoptionspage to replace Qt versions
 
@@ -315,17 +315,17 @@ private:
     QString m_unexpandedDisplayName;
     QString m_autodetectionSource;
     QSet<Core::Id> m_overrideFeatures;
-    mutable Utils::FileName m_sourcePath;
-    mutable Utils::FileName m_qtSources;
+    mutable Utils::FilePath m_sourcePath;
+    mutable Utils::FilePath m_qtSources;
 
-    mutable Utils::FileName m_mkspec;
-    mutable Utils::FileName m_mkspecFullPath;
+    mutable Utils::FilePath m_mkspec;
+    mutable Utils::FilePath m_mkspecFullPath;
 
     mutable QHash<QString, QString> m_mkspecValues;
 
     mutable QHash<ProKey, ProString> m_versionInfo;
 
-    Utils::FileName m_qmakeCommand;
+    Utils::FilePath m_qmakeCommand;
     mutable QString m_qtVersionString;
     mutable QString m_uicCommand;
     mutable QString m_designerCommand;
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index 63b9175c09..c80cbf44c6 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -151,17 +151,17 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI
         } else {
             QString error;
             QString targetDir = destBaseDir + QLatin1Char('/') + exampleDirName;
-            if (FileUtils::copyRecursively(FileName::fromString(projectDir),
-                    FileName::fromString(targetDir), &error)) {
+            if (FileUtils::copyRecursively(FilePath::fromString(projectDir),
+                    FilePath::fromString(targetDir), &error)) {
                 // set vars to new location
                 const QStringList::Iterator end = filesToOpen.end();
                 for (QStringList::Iterator it = filesToOpen.begin(); it != end; ++it)
                     it->replace(projectDir, targetDir);
 
                 foreach (const QString &dependency, dependencies) {
-                    const FileName targetFile = FileName::fromString(targetDir)
+                    const FilePath targetFile = FilePath::fromString(targetDir)
                             .pathAppended(QDir(dependency).dirName());
-                    if (!FileUtils::copyRecursively(FileName::fromString(dependency), targetFile,
+                    if (!FileUtils::copyRecursively(FilePath::fromString(dependency), targetFile,
                             &error)) {
                         QMessageBox::warning(ICore::mainWindow(), tr("Cannot Copy Project"), error);
                         // do not fail, just warn;
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 567f25cd24..415a6ea701 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -42,8 +42,8 @@ static QLoggingCategory log("qtc.qscxmlcgenerator", QtWarningMsg);
 static const char TaskCategory[] = "Task.Category.ExtraCompiler.QScxmlc";
 
 QScxmlcGenerator::QScxmlcGenerator(const Project *project,
-                                   const Utils::FileName &source,
-                                   const Utils::FileNameList &targets, QObject *parent) :
+                                   const Utils::FilePath &source,
+                                   const Utils::FilePathList &targets, QObject *parent) :
     ProcessExtraCompiler(project, source, targets, parent),
     m_tmpdir("qscxmlgenerator")
 {
@@ -59,7 +59,7 @@ Tasks QScxmlcGenerator::parseIssues(const QByteArray &processStderr)
         QByteArrayList tokens = line.split(':');
 
         if (tokens.length() > 4) {
-            Utils::FileName file = Utils::FileName::fromUtf8(tokens[0]);
+            Utils::FilePath file = Utils::FilePath::fromUtf8(tokens[0]);
             int line = tokens[1].toInt();
             // int column = tokens[2].toInt(); <- nice, but not needed for now.
             Task::TaskType type = tokens[3].trimmed() == "error" ?
@@ -72,7 +72,7 @@ Tasks QScxmlcGenerator::parseIssues(const QByteArray &processStderr)
 }
 
 
-Utils::FileName QScxmlcGenerator::command() const
+Utils::FilePath QScxmlcGenerator::command() const
 {
     QtSupport::BaseQtVersion *version = nullptr;
     Target *target;
@@ -82,9 +82,9 @@ Utils::FileName QScxmlcGenerator::command() const
         version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit());
 
     if (!version)
-        return Utils::FileName();
+        return Utils::FilePath();
 
-    return Utils::FileName::fromString(version->qscxmlcCommand());
+    return Utils::FilePath::fromString(version->qscxmlcCommand());
 }
 
 QStringList QScxmlcGenerator::arguments() const
@@ -95,14 +95,14 @@ QStringList QScxmlcGenerator::arguments() const
                         tmpFile().fileName()});
 }
 
-Utils::FileName QScxmlcGenerator::workingDirectory() const
+Utils::FilePath QScxmlcGenerator::workingDirectory() const
 {
-    return Utils::FileName::fromString(m_tmpdir.path());
+    return Utils::FilePath::fromString(m_tmpdir.path());
 }
 
 bool QScxmlcGenerator::prepareToRun(const QByteArray &sourceContents)
 {
-    const Utils::FileName fn = tmpFile();
+    const Utils::FilePath fn = tmpFile();
     QFile input(fn.toString());
     if (!input.open(QIODevice::WriteOnly))
         return false;
@@ -115,10 +115,10 @@ bool QScxmlcGenerator::prepareToRun(const QByteArray &sourceContents)
 FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(QProcess *process)
 {
     Q_UNUSED(process);
-    const Utils::FileName wd = workingDirectory();
+    const Utils::FilePath wd = workingDirectory();
     FileNameToContentsHash result;
-    forEachTarget([&](const Utils::FileName &target) {
-        const Utils::FileName file = wd.pathAppended(target.fileName());
+    forEachTarget([&](const Utils::FilePath &target) {
+        const Utils::FilePath file = wd.pathAppended(target.fileName());
         QFile generated(file.toString());
         if (!generated.open(QIODevice::ReadOnly))
             return;
@@ -127,7 +127,7 @@ FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(QProcess *process
     return result;
 }
 
-Utils::FileName QScxmlcGenerator::tmpFile() const
+Utils::FilePath QScxmlcGenerator::tmpFile() const
 {
     return workingDirectory().pathAppended(source().fileName());
 }
@@ -143,8 +143,8 @@ QString QScxmlcGeneratorFactory::sourceTag() const
 }
 
 ExtraCompiler *QScxmlcGeneratorFactory::create(
-        const Project *project, const Utils::FileName &source,
-        const Utils::FileNameList &targets)
+        const Project *project, const Utils::FilePath &source,
+        const Utils::FilePathList &targets)
 {
     annouceCreation(project, source, targets);
 
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.h b/src/plugins/qtsupport/qscxmlcgenerator.h
index 49cd1dd2cb..37c7617ed6 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.h
+++ b/src/plugins/qtsupport/qscxmlcgenerator.h
@@ -37,16 +37,16 @@ class QScxmlcGenerator : public ProjectExplorer::ProcessExtraCompiler
 {
     Q_OBJECT
 public:
-    QScxmlcGenerator(const ProjectExplorer::Project *project, const Utils::FileName &source,
-                     const Utils::FileNameList &targets, QObject *parent = 0);
+    QScxmlcGenerator(const ProjectExplorer::Project *project, const Utils::FilePath &source,
+                     const Utils::FilePathList &targets, QObject *parent = 0);
 
 protected:
-    Utils::FileName command() const override;
+    Utils::FilePath command() const override;
     QStringList arguments() const override;
-    Utils::FileName workingDirectory() const override;
+    Utils::FilePath workingDirectory() const override;
 
 private:
-    Utils::FileName tmpFile() const;
+    Utils::FilePath tmpFile() const;
     ProjectExplorer::FileNameToContentsHash handleProcessFinished(QProcess *process) override;
     bool prepareToRun(const QByteArray &sourceContents) override;
     ProjectExplorer::Tasks parseIssues(const QByteArray &processStderr) override;
@@ -67,8 +67,8 @@ public:
     QString sourceTag() const override;
 
     ProjectExplorer::ExtraCompiler *create(const ProjectExplorer::Project *project,
-                                           const Utils::FileName &source,
-                                           const Utils::FileNameList &targets) override;
+                                           const Utils::FilePath &source,
+                                           const Utils::FilePathList &targets) override;
 };
 
 } // QtSupport
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 94ab9cc123..c2269ebe07 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -542,7 +542,7 @@ QtOptionsPageWidget::~QtOptionsPageWidget()
 
 void QtOptionsPageWidget::addQtDir()
 {
-    FileName qtVersion = FileName::fromString(
+    FilePath qtVersion = FilePath::fromString(
                 QFileDialog::getOpenFileName(this,
                                              tr("Select a qmake Executable"),
                                              QString(),
@@ -555,7 +555,7 @@ void QtOptionsPageWidget::addQtDir()
     QFileInfo fi = qtVersion.toFileInfo();
     // should add all qt versions here ?
     if (BuildableHelperLibrary::isQtChooser(fi))
-        qtVersion = FileName::fromString(BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget()));
+        qtVersion = FilePath::fromString(BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget()));
 
     auto checkAlreadyExists = [qtVersion](Utils::TreeItem *parent) {
         for (int i = 0; i < parent->childCount(); ++i) {
@@ -614,7 +614,7 @@ void QtOptionsPageWidget::editPath()
 {
     BaseQtVersion *current = currentVersion();
     QString dir = currentVersion()->qmakeCommand().toFileInfo().absolutePath();
-    FileName qtVersion = FileName::fromString(
+    FilePath qtVersion = FilePath::fromString(
                 QFileDialog::getOpenFileName(this,
                                              tr("Select a qmake Executable"),
                                              dir,
diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp
index 08be37d5ab..6176e281c4 100644
--- a/src/plugins/qtsupport/qtparser.cpp
+++ b/src/plugins/qtsupport/qtparser.cpp
@@ -58,7 +58,7 @@ void QtParser::stdError(const QString &line)
         if (level.compare(QLatin1String("Note"), Qt::CaseInsensitive) == 0)
             type = Task::Unknown;
         Task task(type, m_mocRegExp.cap(5).trimmed() /* description */,
-                  Utils::FileName::fromUserInput(m_mocRegExp.cap(1)) /* filename */,
+                  Utils::FilePath::fromUserInput(m_mocRegExp.cap(1)) /* filename */,
                   lineno,
                   ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
         emit addTask(task, 1);
@@ -69,7 +69,7 @@ void QtParser::stdError(const QString &line)
         if (m_translationRegExp.cap(1) == QLatin1String("Error"))
             type = Task::Error;
         Task task(type, m_translationRegExp.cap(2),
-                  Utils::FileName::fromUserInput(m_translationRegExp.cap(3)) /* filename */,
+                  Utils::FilePath::fromUserInput(m_translationRegExp.cap(3)) /* filename */,
                   -1,
                   ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
         emit addTask(task, 1);
@@ -131,7 +131,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Warning,
                                                        QLatin1String("Can't create link to 'Object Trees & Ownership'"),
-                                                       Utils::FileName::fromUserInput(QLatin1String("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp")), 295,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp")), 295,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("moc warning")
@@ -140,7 +140,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Warning,
                                                        QLatin1String("No relevant classes found. No output generated."),
-                                                       Utils::FileName::fromUserInput(QLatin1String("..\\untitled\\errorfile.h")), 0,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("..\\untitled\\errorfile.h")), 0,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("moc warning 2")
@@ -149,7 +149,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Warning,
                                                        QLatin1String("Property declaration ) has no READ accessor function. The property will be invalid."),
-                                                       Utils::FileName::fromUserInput(QLatin1String("c:\\code\\test.h")), 96,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("c:\\code\\test.h")), 96,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("moc note")
@@ -158,7 +158,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Unknown,
                                                        QLatin1String("No relevant classes found. No output generated."),
-                                                       Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("ninja with moc")
@@ -167,7 +167,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Error,
                                                        QLatin1String("Undefined interface"),
-                                                       Utils::FileName::fromUserInput(QLatin1String("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h")), 54,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h")), 54,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("translation")
@@ -176,7 +176,7 @@ void QtSupportPlugin::testQtOutputParser_data()
             << QString() << QString()
             << (Tasks() << Task(Task::Warning,
                                                        QLatin1String("dropping duplicate messages"),
-                                                       Utils::FileName::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1,
+                                                       Utils::FilePath::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1,
                                                        ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
             << QString();
 }
diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp
index 0350995736..0e4124f7d9 100644
--- a/src/plugins/qtsupport/qtprojectimporter.cpp
+++ b/src/plugins/qtsupport/qtprojectimporter.cpp
@@ -45,7 +45,7 @@ using namespace ProjectExplorer;
 
 namespace QtSupport {
 
-QtProjectImporter::QtProjectImporter(const Utils::FileName &path) : ProjectImporter(path)
+QtProjectImporter::QtProjectImporter(const Utils::FilePath &path) : ProjectImporter(path)
 {
     useTemporaryKitAspect(QtKitAspect::id(),
                                [this](Kit *k, const QVariantList &vl) {cleanupTemporaryQt(k, vl);},
@@ -53,7 +53,7 @@ QtProjectImporter::QtProjectImporter(const Utils::FileName &path) : ProjectImpor
 }
 
 QtProjectImporter::QtVersionData
-QtProjectImporter::findOrCreateQtVersion(const Utils::FileName &qmakePath) const
+QtProjectImporter::findOrCreateQtVersion(const Utils::FilePath &qmakePath) const
 {
     QtVersionData result;
     result.qt = QtVersionManager::version(Utils::equal(&BaseQtVersion::qmakeCommand, qmakePath));
@@ -144,9 +144,9 @@ namespace Internal {
 struct DirectoryData {
     DirectoryData(const QString &ip,
                   Kit *k = nullptr, bool ink = false,
-                  const Utils::FileName &qp = Utils::FileName(), bool inq = false) :
+                  const Utils::FilePath &qp = Utils::FilePath(), bool inq = false) :
         isNewKit(ink), isNewQt(inq),
-        importPath(Utils::FileName::fromString(ip)),
+        importPath(Utils::FilePath::fromString(ip)),
         kit(k), qmakePath(qp)
     { }
 
@@ -160,15 +160,15 @@ struct DirectoryData {
 
     const bool isNewKit = false;
     const bool isNewQt = false;
-    const Utils::FileName importPath;
+    const Utils::FilePath importPath;
     Kit *const kit = nullptr;
-    const Utils::FileName qmakePath;
+    const Utils::FilePath qmakePath;
 };
 
 class TestQtProjectImporter : public QtProjectImporter
 {
 public:
-    TestQtProjectImporter(const Utils::FileName &pp, const QList<void *> &testData) :
+    TestQtProjectImporter(const Utils::FilePath &pp, const QList<void *> &testData) :
         QtProjectImporter(pp),
         m_testData(testData)
     { }
@@ -178,7 +178,7 @@ public:
     bool allDeleted() const { return m_deletedTestData.count() == m_testData.count();}
 
 protected:
-    QList<void *> examineDirectory(const Utils::FileName &importPath) const override;
+    QList<void *> examineDirectory(const Utils::FilePath &importPath) const override;
     bool matchKit(void *directoryData, const Kit *k) const override;
     Kit *createKit(void *directoryData) const override;
     const QList<BuildInfo> buildInfoListForKit(const Kit *k, void *directoryData) const override;
@@ -186,7 +186,7 @@ protected:
 
 private:
     const QList<void *> m_testData;
-    mutable Utils::FileName m_path;
+    mutable Utils::FilePath m_path;
     mutable QVector<void*> m_deletedTestData;
 
     QList<Kit *> m_deletedKits;
@@ -197,7 +197,7 @@ QStringList TestQtProjectImporter::importCandidates()
     return QStringList();
 }
 
-QList<void *> TestQtProjectImporter::examineDirectory(const Utils::FileName &importPath) const
+QList<void *> TestQtProjectImporter::examineDirectory(const Utils::FilePath &importPath) const
 {
     m_path = importPath;
 
@@ -268,14 +268,14 @@ void TestQtProjectImporter::deleteDirectoryData(void *directoryData) const
     delete static_cast<DirectoryData *>(directoryData);
 }
 
-static Utils::FileName setupQmake(const BaseQtVersion *qt, const QString &path)
+static Utils::FilePath setupQmake(const BaseQtVersion *qt, const QString &path)
 {
     const QFileInfo fi = QFileInfo(qt->qmakeCommand().toFileInfo().canonicalFilePath());
     const QString qmakeFile = path + "/" + fi.fileName();
     if (!QFile::copy(fi.absoluteFilePath(), qmakeFile))
-        return Utils::FileName();
+        return Utils::FilePath();
 
-    return Utils::FileName::fromString(qmakeFile);
+    return Utils::FilePath::fromString(qmakeFile);
 }
 
 void QtSupportPlugin::testQtProjectImporter_oneProject_data()
@@ -375,10 +375,10 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
     // Customize kit numbers 1 and 2:
     QtKitAspect::setQtVersion(kitTemplates[1], nullptr);
     QtKitAspect::setQtVersion(kitTemplates[2], nullptr);
-    SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FileName::fromString("/some/path"));
-    SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FileName::fromString("/some/other/path"));
+    SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FilePath::fromString("/some/path"));
+    SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FilePath::fromString("/some/other/path"));
 
-    QVector<Utils::FileName> qmakePaths = {defaultQt->qmakeCommand(),
+    QVector<Utils::FilePath> qmakePaths = {defaultQt->qmakeCommand(),
                                            setupQmake(defaultQt, tempDir1.path()),
                                            setupQmake(defaultQt, tempDir2.path())};
 
@@ -405,13 +405,13 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
         testData.append(new DirectoryData(appDir,
                                           (kitIndex < 0) ? nullptr : kitTemplates.at(kitIndex),
                                           (kitIndex > 0), /* new Kit */
-                                          (qtIndex < 0) ? Utils::FileName() : qmakePaths.at(qtIndex),
+                                          (qtIndex < 0) ? Utils::FilePath() : qmakePaths.at(qtIndex),
                                           (qtIndex > 0) /* new Qt */));
     }
 
     // Finally set up importer:
     // Copy the directoryData so that importer is free to delete it later.
-    TestQtProjectImporter importer(Utils::FileName::fromString(tempDir1.path()),
+    TestQtProjectImporter importer(Utils::FilePath::fromString(tempDir1.path()),
                                    Utils::transform(testData, [](DirectoryData *i) {
                                        return static_cast<void *>(new DirectoryData(*i));
                                    }));
@@ -421,7 +421,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
     // --------------------------------------------------------------------
 
     // choose an existing directory to "import"
-    const QList<BuildInfo> buildInfo = importer.import(Utils::FileName::fromString(appDir), true);
+    const QList<BuildInfo> buildInfo = importer.import(Utils::FilePath::fromString(appDir), true);
 
     // VALIDATE: Basic TestImporter state:
     QCOMPARE(importer.projectFilePath().toString(), tempDir1.path());
diff --git a/src/plugins/qtsupport/qtprojectimporter.h b/src/plugins/qtsupport/qtprojectimporter.h
index 082a689bb8..2736787f32 100644
--- a/src/plugins/qtsupport/qtprojectimporter.h
+++ b/src/plugins/qtsupport/qtprojectimporter.h
@@ -37,7 +37,7 @@ class BaseQtVersion;
 class QTSUPPORT_EXPORT QtProjectImporter : public ProjectExplorer::ProjectImporter
 {
 public:
-    QtProjectImporter(const Utils::FileName &path);
+    QtProjectImporter(const Utils::FilePath &path);
 
     class QtVersionData
     {
@@ -47,7 +47,7 @@ public:
     };
 
 protected:
-    QtVersionData findOrCreateQtVersion(const Utils::FileName &qmakePath) const;
+    QtVersionData findOrCreateQtVersion(const Utils::FilePath &qmakePath) const;
     ProjectExplorer::Kit *createTemporaryKit(const QtVersionData &versionData,
                                              const KitSetupFunction &setup) const;
 
diff --git a/src/plugins/qtsupport/qttestparser.cpp b/src/plugins/qtsupport/qttestparser.cpp
index 0492f0631b..901613437e 100644
--- a/src/plugins/qtsupport/qttestparser.cpp
+++ b/src/plugins/qtsupport/qttestparser.cpp
@@ -54,7 +54,7 @@ void QtTestParser::stdOutput(const QString &line)
     QTC_CHECK(triggerPattern.isValid());
     if (triggerPattern.match(theLine).hasMatch()) {
         emitCurrentTask();
-        m_currentTask = Task(Task::Error, theLine, FileName(), -1,
+        m_currentTask = Task(Task::Error, theLine, FilePath(), -1,
                              Constants::TASK_CATEGORY_AUTOTEST);
         return;
     }
@@ -68,7 +68,7 @@ void QtTestParser::stdOutput(const QString &line)
     QTC_CHECK(locationPattern.isValid());
     const QRegularExpressionMatch match = locationPattern.match(theLine);
     if (match.hasMatch()) {
-        m_currentTask.file = FileName::fromString(
+        m_currentTask.file = FilePath::fromString(
                     QDir::fromNativeSeparators(match.captured("file")));
         m_currentTask.line = match.captured("line").toInt();
         emitCurrentTask();
@@ -113,7 +113,7 @@ void QtSupportPlugin::testQtTestOutputParser()
             "PASS   : MyTest::someTest()\n"
             "XPASS: irrelevant\n"
             "PASS   : MyTest::anotherTest()\n";
-    const FileName theFile = FileName::fromString(HostOsInfo::isWindowsHost()
+    const FilePath theFile = FilePath::fromString(HostOsInfo::isWindowsHost()
         ? QString("C:/dev/tests/tst_mytest.cpp") : QString("/home/me/tests/tst_mytest.cpp"));
     const Tasks expectedTasks{
         Task(Task::Error, "XPASS  : MyTest::someTest()", theFile, 154,
diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp
index 2ae9c2030c..4560667d8f 100644
--- a/src/plugins/qtsupport/qtversionfactory.cpp
+++ b/src/plugins/qtsupport/qtversionfactory.cpp
@@ -71,13 +71,13 @@ BaseQtVersion *QtVersionFactory::restore(const QString &type, const QVariantMap
     return version;
 }
 
-BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileName &qmakePath, bool isAutoDetected, const QString &autoDetectionSource, QString *error)
+BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FilePath &qmakePath, bool isAutoDetected, const QString &autoDetectionSource, QString *error)
 {
     QHash<ProKey, ProString> versionInfo;
     if (!BaseQtVersion::queryQMakeVariables(qmakePath, Utils::Environment::systemEnvironment(),
                                             &versionInfo, error))
         return 0;
-    Utils::FileName mkspec = BaseQtVersion::mkspecFromVersionInfo(versionInfo);
+    Utils::FilePath mkspec = BaseQtVersion::mkspecFromVersionInfo(versionInfo);
 
     QMakeVfs vfs;
     QMakeGlobals globals;
diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h
index 9753fccfba..4bafe40c14 100644
--- a/src/plugins/qtsupport/qtversionfactory.h
+++ b/src/plugins/qtsupport/qtversionfactory.h
@@ -29,7 +29,7 @@
 
 #include <QVariantMap>
 
-namespace Utils { class FileName; }
+namespace Utils { class FilePath; }
 
 namespace QtSupport {
 
@@ -54,7 +54,7 @@ public:
     QString supportedType() const;
 
     static BaseQtVersion *createQtVersionFromQMakePath(
-            const Utils::FileName &qmakePath, bool isAutoDetected = false,
+            const Utils::FilePath &qmakePath, bool isAutoDetected = false,
             const QString &autoDetectionSource = QString(), QString *error = nullptr);
 
     static BaseQtVersion *cloneQtVersion(const BaseQtVersion *source);
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 734363d2e6..36e720a8f0 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -75,14 +75,14 @@ static PersistentSettingsWriter *m_writer = nullptr;
 
 enum { debug = 0 };
 
-static FileName globalSettingsFileName()
+static FilePath globalSettingsFileName()
 {
-    return FileName::fromString(Core::ICore::installerResourcePath() + QTVERSION_FILENAME);
+    return FilePath::fromString(Core::ICore::installerResourcePath() + QTVERSION_FILENAME);
 }
 
-static FileName settingsFileName(const QString &path)
+static FilePath settingsFileName(const QString &path)
 {
-    return FileName::fromString(Core::ICore::userResourcePath() + path);
+    return FilePath::fromString(Core::ICore::userResourcePath() + path);
 }
 
 
@@ -109,7 +109,7 @@ QtVersionManager::QtVersionManager()
     m_writer = nullptr;
     m_idcount = 1;
 
-    qRegisterMetaType<FileName>();
+    qRegisterMetaType<FilePath>();
 
     // Give the file a bit of time to settle before reading it...
     m_fileWatcherTimer->setInterval(2000);
@@ -134,7 +134,7 @@ void QtVersionManager::triggerQtVersionRestore()
     emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
     saveQtVersions();
 
-    const FileName configFileName = globalSettingsFileName();
+    const FilePath configFileName = globalSettingsFileName();
     if (configFileName.exists()) {
         m_configFileWatcher = new FileSystemWatcher(m_instance);
         connect(m_configFileWatcher, &FileSystemWatcher::fileChanged,
@@ -178,7 +178,7 @@ static bool restoreQtVersions()
     const QList<QtVersionFactory *> factories = QtVersionFactory::allQtVersionFactories();
 
     PersistentSettingsReader reader;
-    FileName filename = settingsFileName(QLatin1String(QTVERSION_FILENAME));
+    FilePath filename = settingsFileName(QLatin1String(QTVERSION_FILENAME));
 
     if (!reader.load(filename))
         return false;
@@ -234,7 +234,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
 {
     m_fileWatcherTimer->stop();
 
-    const FileName path = globalSettingsFileName();
+    const FilePath path = globalSettingsFileName();
     // Handle overwritting of data:
     if (m_configFileWatcher) {
         m_configFileWatcher->removeFile(path.toString());
@@ -408,16 +408,16 @@ static QString qmakePath(const QString &qtchooser, const QString &version)
     return QString();
 }
 
-static FileNameList gatherQmakePathsFromQtChooser()
+static FilePathList gatherQmakePathsFromQtChooser()
 {
     const QString qtchooser = QStandardPaths::findExecutable(QStringLiteral("qtchooser"));
     if (qtchooser.isEmpty())
-        return FileNameList();
+        return FilePathList();
 
     QList<QByteArray> versions = runQtChooser(qtchooser, QStringList("-l"));
-    QSet<FileName> foundQMakes;
+    QSet<FilePath> foundQMakes;
     foreach (const QByteArray &version, versions) {
-        FileName possibleQMake = FileName::fromString(
+        FilePath possibleQMake = FilePath::fromString(
                     qmakePath(qtchooser, QString::fromLocal8Bit(version)));
         if (!possibleQMake.isEmpty())
             foundQMakes << possibleQMake;
@@ -427,12 +427,12 @@ static FileNameList gatherQmakePathsFromQtChooser()
 
 static void findSystemQt()
 {
-    FileNameList systemQMakes
+    FilePathList systemQMakes
             = BuildableHelperLibrary::findQtsInEnvironment(Environment::systemEnvironment());
 
     systemQMakes.append(gatherQmakePathsFromQtChooser());
 
-    foreach (const FileName &qmakePath, Utils::filteredUnique(systemQMakes)) {
+    foreach (const FilePath &qmakePath, Utils::filteredUnique(systemQMakes)) {
         BaseQtVersion *version
                 = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, false, QLatin1String("PATH"));
         if (version) {
@@ -591,7 +591,7 @@ void QtVersionManager::setNewQtVersions(QList<BaseQtVersion *> newVersions)
         emit m_instance->qtVersionsChanged(addedVersions, removedVersions, changedVersions);
 }
 
-BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const FileName &qmakePath)
+BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const FilePath &qmakePath)
 {
     return version(Utils::equal(&BaseQtVersion::qmakeCommand, qmakePath));
 }
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index 76969b478e..4a9d077752 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -58,7 +58,7 @@ public:
     // Sorting is potentially expensive since it might require qmake --query to run for each version!
     static QList<BaseQtVersion *> sortVersions(const QList<BaseQtVersion *> &input);
 
-    static BaseQtVersion *qtVersionForQMakeBinary(const Utils::FileName &qmakePath);
+    static BaseQtVersion *qtVersionForQMakeBinary(const Utils::FilePath &qmakePath);
 
     static void addVersion(BaseQtVersion *version);
     static void removeVersion(BaseQtVersion *version);
diff --git a/src/plugins/qtsupport/screenshotcropper.cpp b/src/plugins/qtsupport/screenshotcropper.cpp
index 1865826ebf..79e10a8b84 100644
--- a/src/plugins/qtsupport/screenshotcropper.cpp
+++ b/src/plugins/qtsupport/screenshotcropper.cpp
@@ -52,7 +52,7 @@ Q_GLOBAL_STATIC(AreasOfInterest, welcomeScreenAreas)
 
 static inline QString fileNameForPath(const QString &path)
 {
-    return Utils::FileName::fromString(path).fileName();
+    return Utils::FilePath::fromString(path).fileName();
 }
 
 static QRect cropRectForAreaOfInterest(const QSize &imageSize, const QSize &cropSize, const QRect &areaOfInterest)
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index e0cddab37d..9d86893278 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -43,14 +43,14 @@ using namespace ProjectExplorer;
 
 namespace QtSupport {
 
-UicGenerator::UicGenerator(const Project *project, const Utils::FileName &source,
-                           const Utils::FileNameList &targets, QObject *parent) :
+UicGenerator::UicGenerator(const Project *project, const Utils::FilePath &source,
+                           const Utils::FilePathList &targets, QObject *parent) :
     ProcessExtraCompiler(project, source, targets, parent)
 {
     QTC_ASSERT(targets.count() == 1, return);
 }
 
-Utils::FileName UicGenerator::command() const
+Utils::FilePath UicGenerator::command() const
 {
     QtSupport::BaseQtVersion *version = nullptr;
     Target *target;
@@ -60,9 +60,9 @@ Utils::FileName UicGenerator::command() const
         version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit());
 
     if (!version)
-        return Utils::FileName();
+        return Utils::FilePath();
 
-    return Utils::FileName::fromString(version->uicCommand());
+    return Utils::FilePath::fromString(version->uicCommand());
 }
 
 QStringList UicGenerator::arguments() const
@@ -76,7 +76,7 @@ FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process)
     if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0)
         return result;
 
-    const Utils::FileNameList targetList = targets();
+    const Utils::FilePathList targetList = targets();
     if (targetList.size() != 1)
         return result;
     // As far as I can discover in the UIC sources, it writes out local 8-bit encoding. The
@@ -96,8 +96,8 @@ QString UicGeneratorFactory::sourceTag() const
 }
 
 ExtraCompiler *UicGeneratorFactory::create(const Project *project,
-                                           const Utils::FileName &source,
-                                           const Utils::FileNameList &targets)
+                                           const Utils::FilePath &source,
+                                           const Utils::FilePathList &targets)
 {
     annouceCreation(project, source, targets);
 
diff --git a/src/plugins/qtsupport/uicgenerator.h b/src/plugins/qtsupport/uicgenerator.h
index 115343ae95..1253e8f1ab 100644
--- a/src/plugins/qtsupport/uicgenerator.h
+++ b/src/plugins/qtsupport/uicgenerator.h
@@ -36,11 +36,11 @@ class UicGenerator : public ProjectExplorer::ProcessExtraCompiler
 {
     Q_OBJECT
 public:
-    UicGenerator(const ProjectExplorer::Project *project, const Utils::FileName &source,
-                 const Utils::FileNameList &targets, QObject *parent = 0);
+    UicGenerator(const ProjectExplorer::Project *project, const Utils::FilePath &source,
+                 const Utils::FilePathList &targets, QObject *parent = 0);
 
 protected:
-    Utils::FileName command() const override;
+    Utils::FilePath command() const override;
     QStringList arguments() const override;
     ProjectExplorer::FileNameToContentsHash handleProcessFinished(QProcess *process) override;
 };
@@ -56,8 +56,8 @@ public:
     QString sourceTag() const override;
 
     ProjectExplorer::ExtraCompiler *create(const ProjectExplorer::Project *project,
-                                           const Utils::FileName &source,
-                                           const Utils::FileNameList &targets) override;
+                                           const Utils::FilePath &source,
+                                           const Utils::FilePathList &targets) override;
 };
 
 } // QtSupport