From 24314562165588b56a318b3b8a846bf5deda7c41 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 24 Apr 2012 15:49:09 +0200
Subject: Profile introduction

Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index e6b81c209b..7384153647 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -45,6 +45,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/target.h>
 #include <utils/QtConcurrentTools>
 #include <QtConcurrentRun>
 #include <QCoreApplication>
@@ -114,22 +115,21 @@ void CMakeManager::runCMake(ProjectExplorer::Project *project)
     if (!project)
         return;
     CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
-    if (!cmakeProject)
+    if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
         return;
 
-    if (!cmakeProject->activeTarget())
+    CMakeBuildConfiguration *bc
+            = qobject_cast<CMakeBuildConfiguration *>(cmakeProject->activeTarget()->activeBuildConfiguration());
+    if (!bc)
         return;
-    if (!cmakeProject->activeTarget()->activeBuildConfiguration())
-        return;
-    CMakeBuildConfiguration *bc = cmakeProject->activeTarget()->activeBuildConfiguration();
+
     CMakeOpenProjectWizard copw(this,
                                 cmakeProject->projectDirectory(),
                                 bc->buildDirectory(),
                                 CMakeOpenProjectWizard::WantToUpdate,
                                 bc->environment());
-    if (copw.exec() == QDialog::Accepted) {
-        cmakeProject->parseCMakeLists();
-    }
+    if (copw.exec() == QDialog::Accepted)
+        cmakeProject->triggerBuildSystemEvaluation();
 }
 
 ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QString *errorString)
-- 
cgit v1.2.1