From d6d05abcccb706e6825472b696b9e7d5c4f872c6 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 30 Sep 2019 16:03:16 +0200 Subject: [PATCH] BaseQtVersion: Return FilePath from frameworkInstallPath Rename the method to frameworkPath to be more in line with the rest. Change-Id: I3e018ca91e027a95d1ef4993705781957bc68144 Reviewed-by: hjk --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 5 +++-- src/plugins/qtsupport/baseqtversion.cpp | 6 +++--- src/plugins/qtsupport/baseqtversion.h | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index fc619f3b6c1..d8b9744ce86 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -260,8 +260,9 @@ void QmakeProject::updateCppCodeModel() headerPaths += headerPath; } - if (kitInfo.qtVersion && !kitInfo.qtVersion->frameworkInstallPath().isEmpty()) - headerPaths += {kitInfo.qtVersion->frameworkInstallPath(), HeaderPathType::Framework}; + if (kitInfo.qtVersion && !kitInfo.qtVersion->frameworkPath().isEmpty()) + headerPaths += {kitInfo.qtVersion->frameworkPath().toString(), + HeaderPathType::Framework}; rpp.setHeaderPaths(headerPaths); // Files and generators diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index f79e669a250..4e2e5838068 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/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 QString(); + return FilePath::fromString(qmakeProperty("QT_INSTALL_LIBS")); + return {}; } bool BaseQtVersion::hasExamples() const diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 24a476d5163..5e04f4b4141 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/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;