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

QtVersionItem: Remove unused field toolchainId

Browse Source 
Saves some iterations over the toolchains when opening
the QtOptionsPage.

Change-Id: I0d5d0fc7f501b201d6baacdbfc330c1287c4bc5c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Friedemann Kleint
2017-01-10 11:27:01 +01:00
parent f375f197d1
commit 664195c1ec
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -132,16 +132,6 @@ public:
m_buildLog = buildLog; m_buildLog = buildLog;
} }
QByteArray toolChainId() const
{
return m_toolChainId;
}
void setToolChainId(const QByteArray &id)
{
m_toolChainId = id;
}
void setChanged(bool changed) void setChanged(bool changed)
{ {
if (changed == m_changed) if (changed == m_changed)
@@ -154,7 +144,6 @@ private:
BaseQtVersion *m_version = 0; BaseQtVersion *m_version = 0;
QIcon m_icon; QIcon m_icon;
QString m_buildLog; QString m_buildLog;
QByteArray m_toolChainId;
bool m_changed = false; bool m_changed = false;
}; };
@@ -547,8 +536,6 @@ void QtOptionsPageWidget::updateQtVersions(const QList<int> &additions, const QL
BaseQtVersion *version = QtVersionManager::version(a)->clone(); BaseQtVersion *version = QtVersionManager::version(a)->clone();
auto *item = new QtVersionItem(version); auto *item = new QtVersionItem(version);
item->setToolChainId(defaultToolChainId(version));
// Insert in the right place: // Insert in the right place:
Utils::TreeItem *parent = version->isAutodetected()? m_autoItem : m_manualItem; Utils::TreeItem *parent = version->isAutodetected()? m_autoItem : m_manualItem;
parent->appendChild(item); parent->appendChild(item);
@@ -611,8 +598,6 @@ void QtOptionsPageWidget::addQtDir()
auto item = new QtVersionItem(version); auto item = new QtVersionItem(version);
item->setIcon(version->isValid()? m_validVersionIcon : m_invalidVersionIcon); item->setIcon(version->isValid()? m_validVersionIcon : m_invalidVersionIcon);
m_manualItem->appendChild(item); m_manualItem->appendChild(item);
item->setToolChainId(defaultToolChainId(version));
QModelIndex source = m_model->indexForItem(item); QModelIndex source = m_model->indexForItem(item);
m_ui->qtdirList->setCurrentIndex(m_filterModel->mapFromSource(source)); // should update the rest of the ui m_ui->qtdirList->setCurrentIndex(m_filterModel->mapFromSource(source)); // should update the rest of the ui
m_versionUi->nameEdit->setFocus(); m_versionUi->nameEdit->setFocus();
@@ -669,7 +654,6 @@ void QtOptionsPageWidget::editPath()
// Update ui // Update ui
if (QtVersionItem *item = currentItem()) { if (QtVersionItem *item = currentItem()) {
item->setVersion(version); item->setVersion(version);
item->setToolChainId(defaultToolChainId(version));
item->setIcon(version->isValid()? m_validVersionIcon : m_invalidVersionIcon); item->setIcon(version->isValid()? m_validVersionIcon : m_invalidVersionIcon);
} }
userChangedCurrentVersion(); userChangedCurrentVersion();