Merge branch '2.3'

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index a3360b280a..f0da0a29e1 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()
@@ -301,6 +302,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()