diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-21 15:44:59 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-22 12:50:47 +0100 |
commit | 4d775ac56ac554b85c133d9eff5751d006c6171b (patch) | |
tree | 300a410909d4786e8fb071154d104def650a690e /src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp | |
parent | 47c3037c3df6be903228ecd5df04cc5f03020972 (diff) |
Kits: Fix editing of sysroot and mkspec
Task-number: QTCREATORBUG-8586
Change-Id: I074d7e85524e4dccef26c46391892477269648ce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp index d5546f90b1..95f7e2ec5a 100644 --- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp @@ -44,7 +44,8 @@ namespace Internal { QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, QWidget *parent) : ProjectExplorer::KitConfigWidget(parent), m_kit(k), - m_lineEdit(new QLineEdit) + m_lineEdit(new QLineEdit), + m_ignoreChange(false) { setToolTip(tr("The mkspec to use when building the project with qmake.<br>" "This setting is ignored when using other build systems.")); @@ -70,12 +71,15 @@ void QmakeKitConfigWidget::makeReadOnly() void QmakeKitConfigWidget::refresh() { - m_lineEdit->setText(QmakeKitInformation::mkspec(m_kit).toString()); + if (!m_ignoreChange) + m_lineEdit->setText(QmakeKitInformation::mkspec(m_kit).toUserOutput()); } void QmakeKitConfigWidget::mkspecWasChanged(const QString &text) { + m_ignoreChange = true; QmakeKitInformation::setMkspec(m_kit, Utils::FileName::fromString(text)); + m_ignoreChange = false; } } // namespace Internal |