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

QtSupport: qt version display name from data to private struct

Browse Source 
The data is mainly used for qmake query generated data

Change-Id: Ic71c8e3c573d6858806d27fb854f1c11e0818b7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2024-10-25 14:28:21 +02:00
parent 396577a4c6
commit 4d66293233
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,6 @@ public:
std::optional<Abis> qtAbis; std::optional<Abis> qtAbis;
DisplayName unexpandedDisplayName;
QString qtVersionString; QString qtVersionString;
FilePath sourcePath; FilePath sourcePath;
@@ -191,6 +190,7 @@ public:
int m_id = -1; int m_id = -1;
bool m_isAutodetected = false; bool m_isAutodetected = false;
QString m_type; QString m_type;
DisplayName m_unexpandedDisplayName;
QtVersionData m_data; QtVersionData m_data;
@@ -626,7 +626,7 @@ void QtVersion::fromMap(const Store &map, const FilePath &filePath)
d->m_id = map.value(Constants::QTVERSIONID).toInt(); 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 if (d->m_id == -1) // this happens on adding from installer, see updateFromInstaller => get a new unique id
d->m_id = QtVersionManager::getUniqueId(); d->m_id = QtVersionManager::getUniqueId();
d->m_data.unexpandedDisplayName.fromMap(map, Constants::QTVERSIONNAME); d->m_unexpandedDisplayName.fromMap(map, Constants::QTVERSIONNAME);
d->m_isAutodetected = map.value(QTVERSIONAUTODETECTED).toBool(); d->m_isAutodetected = map.value(QTVERSIONAUTODETECTED).toBool();
d->m_detectionSource = map.value(QTVERSIONDETECTIONSOURCE).toString(); d->m_detectionSource = map.value(QTVERSIONDETECTIONSOURCE).toString();
d->m_overrideFeatures = Utils::Id::fromStringList(map.value(QTVERSION_OVERRIDE_FEATURES).toStringList()); d->m_overrideFeatures = Utils::Id::fromStringList(map.value(QTVERSION_OVERRIDE_FEATURES).toStringList());
@@ -669,7 +669,7 @@ Store QtVersion::toMap() const
{ {
Store result; Store result;
result.insert(Constants::QTVERSIONID, uniqueId()); result.insert(Constants::QTVERSIONID, uniqueId());
d->m_data.unexpandedDisplayName.toMap(result, Constants::QTVERSIONNAME); d->m_unexpandedDisplayName.toMap(result, Constants::QTVERSIONNAME);
result.insert(QTVERSIONAUTODETECTED, isAutodetected()); result.insert(QTVERSIONAUTODETECTED, isAutodetected());
result.insert(QTVERSIONDETECTIONSOURCE, detectionSource()); result.insert(QTVERSIONDETECTIONSOURCE, detectionSource());
@@ -817,17 +817,17 @@ QString QtVersion::displayName() const
QString QtVersion::unexpandedDisplayName() const QString QtVersion::unexpandedDisplayName() const
{ {
return d->m_data.unexpandedDisplayName.value(); return d->m_unexpandedDisplayName.value();
} }
void QtVersion::setUnexpandedDisplayName(const QString &name) void QtVersion::setUnexpandedDisplayName(const QString &name)
{ {
d->m_data.unexpandedDisplayName.setValue(name); d->m_unexpandedDisplayName.setValue(name);
} }
void QtVersion::updateDefaultDisplayName() void QtVersion::updateDefaultDisplayName()
{ {
d->m_data.unexpandedDisplayName.setDefaultValue(defaultUnexpandedDisplayName()); d->m_unexpandedDisplayName.setDefaultValue(defaultUnexpandedDisplayName());
} }
QString QtVersion::toHtml(bool verbose) const QString QtVersion::toHtml(bool verbose) const