diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-16 15:31:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-16 15:31:02 +0100 |
| commit | 3e7d94c3626c6904320018d2eedb1407925ed3d5 (patch) | |
| tree | 57479823338e07de3c3ce41bdda46abf58f4ac57 /src/plugins/projectexplorer/buildmanager.cpp | |
| parent | 51bca851174c347edcc6b148ee3a67d70e5fa9eb (diff) | |
| parent | 5981b1e5509395bc0eb0ff7071e63a529b31fb11 (diff) | |
| download | qt-creator-3e7d94c3626c6904320018d2eedb1407925ed3d5.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
Diffstat (limited to 'src/plugins/projectexplorer/buildmanager.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 4fcac55256..5fa164d850 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -402,7 +402,7 @@ void BuildManager::nextBuildQueue() // Build Failure const QString projectName = d->m_currentBuildStep->project()->displayName(); const QString targetName = d->m_currentBuildStep->target()->displayName(); - addToOutputWindow(tr("Error while building/deploying project %1 (target: %2)").arg(projectName, targetName), BuildStep::ErrorOutput); + addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::ErrorOutput); addToOutputWindow(tr("When executing step '%1'").arg(d->m_currentBuildStep->displayName()), BuildStep::ErrorOutput); // NBS TODO fix in qtconcurrent d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, tr("Error while building/deploying project %1 (target: %2)").arg(projectName, targetName)); |