diff options
| author | hjk <hjk@qt.io> | 2024-03-12 15:40:37 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2024-03-13 07:54:50 +0000 |
| commit | 3322186b0d6b60b752ec0a513d42d5c8c1c4c85f (patch) | |
| tree | fd6300e71dfe781c3dc9928c50521def9dfe90d8 | |
| parent | 3f8bc98109c90c743ba7fddf2edde54c53761027 (diff) | |
BaseQtVersion: Drop cache related paramenter QtVersion::fromMap
Not used anymore.
Change-Id: I992bde278af360d9d67fd86fd79bb035cafd2bec
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
| -rw-r--r-- | src/plugins/qnx/qnxqtversion.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qnx/qnxqtversion.h | 4 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 6 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 6a74d620dbc..31856271d15 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -116,9 +116,9 @@ Store QnxQtVersion::toMap() const return result; } -void QnxQtVersion::fromMap(const Store &map, const FilePath &, bool forceRefreshCache) +void QnxQtVersion::fromMap(const Store &map, const FilePath &) { - QtVersion::fromMap(map, {}, forceRefreshCache); + QtVersion::fromMap(map, {}); setSdpPath(FilePath::fromSettings(map.value(SDP_PATH_KEY))); } diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h index db6c47666d8..309e881f5a9 100644 --- a/src/plugins/qnx/qnxqtversion.h +++ b/src/plugins/qnx/qnxqtversion.h @@ -28,9 +28,7 @@ public: QString cpuDir() const; Utils::Store toMap() const override; - void fromMap(const Utils::Store &map, - const Utils::FilePath &filePath, - bool forceRefreshCache) override; + void fromMap(const Utils::Store &map, const Utils::FilePath &filePath) override; ProjectExplorer::Abis detectQtAbis() const override; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index e08c0227aff..cee3f88d8b6 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -740,7 +740,7 @@ bool QtVersion::hasReleaseBuild() const return !d->m_defaultConfigIsDebug || d->m_defaultConfigIsDebugAndRelease; } -void QtVersion::fromMap(const Store &map, const FilePath &filePath, bool forceRefreshCache) +void QtVersion::fromMap(const Store &map, const FilePath &filePath) { d->m_id = map.value(Constants::QTVERSIONID).toInt(); if (d->m_id == -1) // this happens on adding from installer, see updateFromInstaller => get a new unique id @@ -2448,13 +2448,13 @@ QtVersion *QtVersionFactory::create() const return version; } -QtVersion *QtVersion::clone(bool forceRefreshCache) const +QtVersion *QtVersion::clone() const { for (QtVersionFactory *factory : std::as_const(g_qtVersionFactories)) { if (factory->m_supportedType == d->m_type) { QtVersion *version = factory->create(); QTC_ASSERT(version, return nullptr); - version->fromMap(toMap(), {}, forceRefreshCache); + version->fromMap(toMap(), {}); // Qt Abis are either provided by SDK Tool, or detected from the binaries. // The auto detection is not perfect, and we always want to use the data provided by diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 4220900fd34..5357a521cdb 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -49,9 +49,7 @@ public: virtual ~QtVersion(); - virtual void fromMap(const Utils::Store &map, - const Utils::FilePath &filePath = {}, - bool forceRefreshCache = false); + virtual void fromMap(const Utils::Store &map, const Utils::FilePath &filePath = {}); virtual bool equals(QtVersion *other); bool isAutodetected() const; @@ -223,7 +221,7 @@ private: friend class Internal::QtSettingsPageWidget; void setId(int id); - QtVersion *clone(bool forceRefreshCache = false) const; + QtVersion *clone() const; Internal::QtVersionPrivate *d = nullptr; }; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index a33514b836f..7eb349d1da9 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -602,7 +602,7 @@ void QtSettingsPageWidget::updateQtVersions(const QList<int> &additions, const Q // Add changed/added items: for (int a : std::as_const(toAdd)) { - QtVersion *version = QtVersionManager::version(a)->clone(true); + QtVersion *version = QtVersionManager::version(a)->clone(); auto *item = new QtVersionItem(version); // Insert in the right place: |