From 97393752550e348c994881bc76d849b03289ec4d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 9 May 2012 10:44:58 +0000
Subject: [PATCH] Qt4BC: Get a better Qt version when the old one is deleted

Explicitly select a a new Qt version when the one in use gets
deleted. Do not rely on the UI doing the right thing anymore.

Change-Id: Ia78b56ae15a1aa81d11227d1f07ce43bff19b0f2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 .../qt4projectmanager/qt4buildconfiguration.cpp      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index f84d11b72b1..7a86929c61d 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -474,8 +474,16 @@ MakeStep *Qt4BuildConfiguration::makeStep() const
 void Qt4BuildConfiguration::qtVersionsChanged(const QList<int> &addedVersions, const QList<int> &removedVersions, const QList<int> &changedVersions)
 {
     Q_UNUSED(addedVersions);
-    if (removedVersions.contains(m_qtVersionId) || changedVersions.contains(m_qtVersionId))
-        emit environmentChanged(); // Our qt version changed, that might have changed the environment
+    if (removedVersions.contains(m_qtVersionId)) {
+        m_qtVersionId = -1;
+        QList<QtSupport::BaseQtVersion *> versionList
+                = QtSupport::QtVersionManager::instance()->versionsForTargetId(target()->id());
+        if (!versionList.isEmpty())
+            m_qtVersionId = versionList.at(0)->uniqueId();
+        emit qtVersionChanged();
+    } else if (changedVersions.contains(m_qtVersionId)) {
+        emit environmentChanged();
+    }
 }
 
 // returns true if both are equal