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

Merge branch '2.3' into 2.4

Browse Source 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
This commit is contained in:
Oswald Buddenhagen
2011-10-18 13:50:38 +02:00
parent aa95055eb0 dd324e0634
commit 0164e1bea2
22 changed files with 29650 additions and 7007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -409,7 +409,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
m_ui->problemLabel->setVisible(true);
m_ui->warningLabel->setVisible(true);
m_ui->importLabel->setVisible(false);
m_ui->problemLabel->setText(tr("An build for a different project exists in %1, which will be overwritten.",
m_ui->problemLabel->setText(tr("A build for a different project exists in %1, which will be overwritten.",
"%1 build directory").
arg(m_ui->shadowBuildDirEdit->path()));
} else if (!issues.isEmpty()) {