diff options
author | Daniel Teske <daniel.teske@nokia.com> | 2011-07-28 18:23:01 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@nokia.com> | 2011-07-29 12:19:27 +0200 |
commit | b407a51c374dafc8304e39840f1ceec171f9076e (patch) | |
tree | 426ecf1d9604a0576069e71d93c3d4073dacc739 /src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp | |
parent | 1757228278004b56fcf3ff5f3fccd80216b7df2d (diff) | |
download | qt-creator-b407a51c374dafc8304e39840f1ceec171f9076e.tar.gz |
Show baseEnvironment changes in QmlProjectRunConfigurations's widget
That react to editing qt versions and selecting a different qt version.
The environment also depends on the available toolchains, that is
not taken into account.
Change-Id: I70fc1d444a0cbceb4fcb35fb7961bac8a0db9c14
Reviewed-on: http://codereview.qt.nokia.com/2353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp index 08821eccde..25e2c65cc3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp @@ -110,9 +110,6 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun layout->addWidget(detailsWidget); - updateFileComboBox(); - updateQtVersionComboBox(); - // // Debugging // @@ -166,6 +163,9 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun layout->addWidget(m_environmentWidget); + + updateFileComboBox(); + updateQtVersionComboBox(); } static bool caseInsensitiveLessThan(const QString &s1, const QString &s2) @@ -252,6 +252,7 @@ void QmlProjectRunConfigurationWidget::onQtVersionSelectionChanged() QTC_ASSERT(data.isValid() && data.canConvert(QVariant::Int), return) m_runConfiguration->setQtVersionId(data.toInt()); m_runConfiguration->updateEnabled(); + m_environmentWidget->setBaseEnvironment(m_runConfiguration->baseEnvironment()); } void QmlProjectRunConfigurationWidget::onViewerArgsChanged() @@ -303,6 +304,8 @@ void QmlProjectRunConfigurationWidget::updateQtVersionComboBox() m_qtVersionComboBox->addItem(tr("Invalid Qt version"), -1); m_qtVersionComboBox->setCurrentIndex(0); } + // Might have edited the qt version or changed e.g. the sysroot of a SymbianQtVersion + m_environmentWidget->setBaseEnvironment(m_runConfiguration->baseEnvironment()); } void QmlProjectRunConfigurationWidget::userChangesChanged() |