feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BaseQtVersion: Return FilePath from frameworkInstallPath

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

Change-Id: I3e018ca91e027a95d1ef4993705781957bc68144
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-30 16:03:16 +02:00
parent a542f5075f
commit d6d05abccc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -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

6
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -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

3
src/plugins/qtsupport/baseqtversion.h
View File

@@ -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;