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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
This commit is contained in:
con
2010-05-17 17:40:40 +02:00
parent d8318a9502 b52f3cb274
commit 38f6379f39
106 changed files with 1205 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View File

@@ -75,7 +75,7 @@ S60CreatePackageStep::S60CreatePackageStep(ProjectExplorer::BuildConfiguration *
void S60CreatePackageStep::ctor_package()
{
setDisplayName(tr("Create sis Package", "Create sis package build step name"));
setDisplayName(tr("Create SIS Package", "Create SIS package build step name"));
}
S60CreatePackageStep::~S60CreatePackageStep()
@@ -239,7 +239,7 @@ QStringList S60CreatePackageStepFactory::availableCreationIds(ProjectExplorer::B
QString S60CreatePackageStepFactory::displayNameForId(const QString &id) const
{
if (id == QLatin1String(SIGN_BS_ID))
return tr("Create sis Package");
return tr("Create SIS Package");
return QString();
}
@@ -299,8 +299,8 @@ QString S60CreatePackageStepConfigWidget::summaryText() const
.arg(m_signStep->customKeyPath());
}
if (m_signStep->createSmartInstaller())
return tr("<b>Create sis Package:</b> %1, using Smart Installer").arg(text);
return tr("<b>Create sis Package:</b> %1").arg(text);
return tr("<b>Create SIS Package:</b> %1, using Smart Installer").arg(text);
return tr("<b>Create SIS Package:</b> %1").arg(text);
}
QString S60CreatePackageStepConfigWidget::displayName() const