diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-24 15:49:09 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-06-21 12:08:12 +0200 |
| commit | 24314562165588b56a318b3b8a846bf5deda7c41 (patch) | |
| tree | b5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | |
| parent | 8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff) | |
| download | qt-creator-24314562165588b56a318b3b8a846bf5deda7c41.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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) |