From 37dec964c147dd26e5ddfa344b376659c4e6d0bb Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 10 Jul 2013 14:20:26 +0200 Subject: [PATCH] QtVersion: Allow the user to rename autodetected qt versions Task-number: QTCREATORBUG-9787 Change-Id: Id6fc29ea5466c76ffd8f2cddc2cc7583395b9ba3 Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/qtoptionspage.cpp | 2 +- src/plugins/qtsupport/qtversionmanager.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index a9e7024dfd7..838dc5a0fd0 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -1026,7 +1026,7 @@ void QtOptionsPageWidget::updateWidgets() const bool enabled = version != 0; const bool isAutodetected = enabled && version->isAutodetected(); m_ui->delButton->setEnabled(enabled && !isAutodetected); - m_versionUi->nameEdit->setEnabled(enabled && !isAutodetected); + m_versionUi->nameEdit->setEnabled(enabled); m_versionUi->editPathPushButton->setEnabled(enabled && !isAutodetected); } diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 0b8f0adb1db..615a3d0ed5f 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -294,6 +294,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) qDebug() << " Qt version found with same autodetection source" << autoDetectionSource << " => Migrating id:" << id; m_versions.remove(id); qtversionMap[QLatin1String(Constants::QTVERSIONID)] = id; + qtversionMap[QLatin1String(Constants::QTVERSIONNAME)] = v->displayName(); delete v; if (BaseQtVersion *qtv = factory->restore(type, qtversionMap)) {