1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 014cd52632..a7f5ceff4e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -169,7 +169,6 @@ void CMakeProject::changeActiveBuildConfiguration(ProjectExplorer::BuildConfigur
                                     mode,
                                     cmakebc->environment());
         copw.exec();
-        cmakebc->setMsvcVersion(copw.msvcVersion());
     }
     // reparse
     parseCMakeLists();
@@ -282,6 +281,9 @@ bool CMakeProject::parseCMakeLists()
     //qDebug()<<"Updating CodeModel";
     createUiCodeModelSupport();
 
+    if (!activeBC->toolChain())
+        return true;
+
     QStringList allIncludePaths;
     QStringList allFrameworkPaths;
     QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeBC->toolChain()->systemHeaderPaths();
@@ -527,9 +529,9 @@ bool CMakeProject::fromMap(const QVariantMap &map)
 
         CMakeBuildConfiguration *bc =
                 static_cast<CMakeBuildConfiguration *>(t->buildConfigurations().at(0));
-        bc->setMsvcVersion(copw.msvcVersion());
         if (!copw.buildDirectory().isEmpty())
             bc->setBuildDirectory(copw.buildDirectory());
+        bc->setToolChain(copw.toolChain());
 
         addTarget(t);
     } else {
@@ -554,7 +556,7 @@ bool CMakeProject::fromMap(const QVariantMap &map)
                                         activeBC->environment());
             if (copw.exec() != QDialog::Accepted)
                 return false;
-            activeBC->setMsvcVersion(copw.msvcVersion());
+            activeBC->setToolChain(copw.toolChain());
         }
     }