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

TargetSetupPage: Prefer the default kit for the active target

Browse Source 
Change-Id: Ia57685e7ffc5f9d45777731d24e5c8d218a4d5a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-08-08 15:46:24 +02:00
parent 70e1aad041
commit b849f64bbe
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
View File

@@ -698,12 +698,19 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
// c) the first target
ProjectExplorer::Target *activeTarget = 0;
QList<ProjectExplorer::Target *> targets = project->targets();
int activeTargetPriority = 0;
foreach (ProjectExplorer::Target *t, targets) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(t->kit());
if (version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT))
if (t->kit() == ProjectExplorer::KitManager::instance()->defaultKit()) {
activeTarget = t;
else if (!activeTarget && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT))
activeTargetPriority = 3;
} else if (activeTargetPriority < 2 && version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)) {
activeTarget = t;
activeTargetPriority = 2;
} else if (activeTargetPriority < 1 && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)) {
activeTarget = t;
activeTargetPriority = 1;
}
}
if (!activeTarget && !targets.isEmpty())
activeTarget = targets.first();