From 1aa3ec58a9b846ce62671ac3000ac849ca99b5ad Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 16 Feb 2010 11:09:36 +0100
Subject: [PATCH] Fix initialization of toolchain combobox in Qt4project

 * Initialize it to the toolchain used, not the preferred one
---
 src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 68eb49b6441..9aab42f1344 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -417,7 +417,7 @@ void Qt4ProjectConfigWidget::updateToolChainCombo()
     foreach (ToolChain::ToolChainType toolchain, toolchains)
         m_ui->toolChainComboBox->addItem(ToolChain::toolChainName(toolchain), qVariantFromValue(toolchain));
     m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
-    m_ui->toolChainComboBox->setCurrentIndex(toolchains.indexOf(m_buildConfiguration->qt4Target()->preferredToolChainType(toolchains)));
+    m_ui->toolChainComboBox->setCurrentIndex(toolchains.indexOf(m_buildConfiguration->toolChainType()));
     updateDetails();
 }
 
-- 
GitLab