feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Profile introduction

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2012-04-24 15:49:09 +02:00
parent 8c77b8c9d7
commit 2431456216
379 changed files with 12690 additions and 14437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -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)