diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-09-30 15:48:31 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-01 07:37:10 +0000 |
| commit | 67934ccaaa0cad0de3cde09cf63ed2710fb2f276 (patch) | |
| tree | 0c4b30ccb06ebece0bc7a0912ada2628eb6a7e53 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 3404a44ee1bf0cc72cecd899246f35f842b1e970 (diff) | |
BaseQtVersion: Use FilePath for demosPath()
Change-Id: I83bcbf64a37faf0f88c6b1f655ff3d5c5d7e623c
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 6049f8b3e51..f7daaadf7b6 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1257,9 +1257,9 @@ bool BaseQtVersion::hasDemos() const return d->m_hasDemos; } -QString BaseQtVersion::demosPath() const +FilePath BaseQtVersion::demosPath() const { - return QFileInfo(qmakeProperty("QT_INSTALL_DEMOS")).canonicalFilePath(); + return FilePath::fromString(QFileInfo(qmakeProperty("QT_INSTALL_DEMOS")).canonicalFilePath()); } QString BaseQtVersion::frameworkInstallPath() const @@ -1846,7 +1846,7 @@ bool BaseQtVersion::isSubProject(const FilePath &filePath) const if (!examples.isEmpty() && filePath.isChildOf(QDir(examples))) return true; - const QString &demos = demosPath(); + const QString demos = demosPath().toString(); if (!demos.isEmpty() && filePath.isChildOf(QDir(demos))) return true; |