BaseQtVersion: Return FilePath from frameworkInstallPath

Rename the method to frameworkPath to be more in line with the rest.

Change-Id: I3e018ca91e027a95d1ef4993705781957bc68144
Reviewed-by: hjk <hjk@qt.io>

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -260,8 +260,9 @@ void QmakeProject::updateCppCodeModel()
                 headerPaths += headerPath;
         }
 
-        if (kitInfo.qtVersion && !kitInfo.qtVersion->frameworkInstallPath().isEmpty())
+        if (kitInfo.qtVersion && !kitInfo.qtVersion->frameworkPath().isEmpty())
-            headerPaths += {kitInfo.qtVersion->frameworkInstallPath(), HeaderPathType::Framework};
+            headerPaths += {kitInfo.qtVersion->frameworkPath().toString(),
+                            HeaderPathType::Framework};
         rpp.setHeaderPaths(headerPaths);
 
         // Files and generators

src/plugins/qtsupport/baseqtversion.cpp

@@ -1257,11 +1257,11 @@ FilePath BaseQtVersion::demosPath() const
     return FilePath::fromString(QFileInfo(qmakeProperty("QT_INSTALL_DEMOS")).canonicalFilePath());
 }
 
-QString BaseQtVersion::frameworkInstallPath() const
+FilePath BaseQtVersion::frameworkPath() const
 {
     if (HostOsInfo::isMacHost())
-        return qmakeProperty("QT_INSTALL_LIBS");
+        return FilePath::fromString(qmakeProperty("QT_INSTALL_LIBS"));
-    return QString();
+    return {};
 }
 
 bool BaseQtVersion::hasExamples() const

src/plugins/qtsupport/baseqtversion.h

@@ -149,8 +149,6 @@ public:
     bool hasDocs() const;
     bool hasDemos() const;
 
-    QString frameworkInstallPath() const;
-
     // former local functions
     Utils::FilePath qmakeCommand() const;
 
@@ -203,6 +201,7 @@ public:
     Utils::FilePath demosPath() const;
     Utils::FilePath docsPath() const;
     Utils::FilePath examplesPath() const;
+    Utils::FilePath frameworkPath() const;
     Utils::FilePath libraryPath() const;
     Utils::FilePath pluginPath() const;
     Utils::FilePath qmlPath() const;