From f25638f7f5c49f556cc0cbbdc51ace4898fdae24 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 13 Feb 2009 11:12:52 +0100
Subject: [PATCH 1/2] Fixes:    Another crash

Task:     Found on irc.
---
 src/plugins/qt4projectmanager/qt4project.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 492dc2c50d0..569d2e82820 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -700,7 +700,9 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
 {
     Environment env = useSystemEnvironment(buildConfiguration) ? Environment(QProcess::systemEnvironment()) : Environment();
     qtVersion(buildConfiguration)->addToEnvironment(env);
-    toolChain(buildConfiguration)->addToEnvironment(env);
+    ToolChain *tc = toolChain(buildConfiguration);
+    if (tc)
+        tc->addToEnvironment(env);
     return env;
 }
 

From 9cb615609c94069b12c5d6d310d6780d07e1b816 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 13 Feb 2009 12:02:58 +0100
Subject: [PATCH 2/2] Fixes:    Another crash

Task:     Also from irc.
---
 src/plugins/qt4projectmanager/qt4project.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 2922987b105..19de5ea3a30 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -406,7 +406,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
 {
     qDebug()<<"Qt4Project::toolChain() for buildconfiguration:"<<buildConfiguration;
     Q_UNUSED(buildConfiguration);
-    ToolChain *m_test;
+    ToolChain *m_test= 0;
     QtVersion *version = qtVersion(activeBuildConfiguration());
     ToolChain::ToolChainType t = version->toolchainType();
     if (t == ToolChain::MinGW) {
@@ -436,9 +436,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
         qDebug()<<"Qt Creator doesn't know about the system includes, nor the systems defines.";
     }
 
-
-
-    if (m_test == m_toolChain) {
+    if (ToolChain::equals(m_test, m_toolChain)) {
         delete m_test;
     } else {
         delete m_toolChain;