diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index e1c009498be9d3456328fdd0a47ece61d7e19b8d..3c467bb1cb846e3dff87d2f897398f7b442d7fbf 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -79,7 +79,10 @@ QString GCCEToolChain::makeCommand() const
 
 bool GCCEToolChain::equals(ToolChain *other) const
 {
+    GCCEToolChain *otherGCCE = static_cast<GCCEToolChain *>(other);
     return (other->type() == type()
-            && m_deviceId == static_cast<GCCEToolChain *>(other)->m_deviceId
-            && m_deviceName == static_cast<GCCEToolChain *>(other)->m_deviceName);
+            && m_deviceId == otherGCCE->m_deviceId
+            && m_deviceName == otherGCCE->m_deviceName
+            && m_deviceRoot == otherGCCE->m_deviceRoot
+            && m_gcceCommand == otherGCCE->m_gcceCommand);
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
index 1a0f6026022670885d0b21b2476a463c5ebb2a4e..572f1c76fb0df5145e96d575643dde018698e871 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
@@ -115,7 +115,10 @@ QString WINSCWToolChain::makeCommand() const
 
 bool WINSCWToolChain::equals(ToolChain *other) const
 {
+    WINSCWToolChain *otherWINSCW = static_cast<WINSCWToolChain *>(other);
     return (other->type() == type()
-            && m_deviceId == static_cast<WINSCWToolChain *>(other)->m_deviceId
-            && m_deviceName == static_cast<WINSCWToolChain *>(other)->m_deviceName);
+            && m_deviceId == otherWINSCW->m_deviceId
+            && m_deviceName == otherWINSCW->m_deviceName
+            && m_deviceRoot == otherWINSCW->m_deviceRoot
+            && m_carbidePath == otherWINSCW->m_carbidePath);
 }