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

BaseQtVersion: Have examplesPath() return a FilePath

Browse Source 
Change-Id: I6b37345022d7cdba4aef0af0ca2a825c8606062c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-30 15:44:52 +02:00
parent 9c84c6b271
commit 3404a44ee1
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,9 +1275,9 @@ bool BaseQtVersion::hasExamples() const
return d->m_hasExamples; return d->m_hasExamples;
} }
QString BaseQtVersion::examplesPath() const FilePath BaseQtVersion::examplesPath() const
{ {
return QFileInfo(qmakeProperty("QT_INSTALL_EXAMPLES")).canonicalFilePath(); return FilePath::fromString(QFileInfo(qmakeProperty("QT_INSTALL_EXAMPLES")).canonicalFilePath());
} }
QStringList BaseQtVersion::qtSoPaths() const QStringList BaseQtVersion::qtSoPaths() const
@@ -1842,7 +1842,7 @@ bool BaseQtVersion::isSubProject(const FilePath &filePath) const
return true; return true;
} }
const QString &examples = examplesPath(); const QString examples = examplesPath().toString();
if (!examples.isEmpty() && filePath.isChildOf(QDir(examples))) if (!examples.isEmpty() && filePath.isChildOf(QDir(examples)))
return true; return true;

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

@@ -143,11 +143,9 @@ public:
QString qtVersionString() const; QString qtVersionString() const;
QtVersionNumber qtVersion() const; QtVersionNumber qtVersion() const;
bool hasExamples() const;
QString examplesPath() const;
QStringList qtSoPaths() const; QStringList qtSoPaths() const;
bool hasExamples() const;
bool hasDocumentation() const; bool hasDocumentation() const;
QString documentationPath() const; QString documentationPath() const;
@@ -206,6 +204,7 @@ public:
Utils::FilePath headerPath() const; Utils::FilePath headerPath() const;
Utils::FilePath docsPath() const; Utils::FilePath docsPath() const;
Utils::FilePath examplesPath() const;
Utils::FilePath libraryPath() const; Utils::FilePath libraryPath() const;
Utils::FilePath pluginPath() const; Utils::FilePath pluginPath() const;
Utils::FilePath qmlPath() const; Utils::FilePath qmlPath() const;

2
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -578,7 +578,7 @@ QStringList ExampleSetModel::exampleSources(QString *examplesInstallPath, QStrin
foreach (BaseQtVersion *version, QtVersionManager::versions()) { foreach (BaseQtVersion *version, QtVersionManager::versions()) {
if (version->uniqueId() == qtId) { if (version->uniqueId() == qtId) {
manifestScanPath = version->documentationPath(); manifestScanPath = version->documentationPath();
examplesPath = version->examplesPath(); examplesPath = version->examplesPath().toString();
demosPath = version->demosPath(); demosPath = version->demosPath();
break; break;
} }