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

tr()-Fixes in master.

Browse Source 
- Add missing Q_OBJECTS
- Clean up Android, fix capitalization, remove redundant
  translations.

Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-05-25 16:21:19 +02:00
committed by hjk
parent bc9326abb7
commit 753acdcf82
13 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -41,16 +41,23 @@ using namespace Android::Internal;
const Core::Id AndroidPackageInstallationStep::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
static inline QString stepDisplayName()
{
return AndroidPackageInstallationStep::tr("Copy application data");
}
AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl) : MakeStep(bsl, Id)
{
setDefaultDisplayName(tr("Copy application data"));
setDisplayName(tr("Copy application data"));
const QString name = stepDisplayName();
setDefaultDisplayName(name);
setDisplayName(name);
}
AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc, AndroidPackageInstallationStep *other): MakeStep(bc, other)
{
setDefaultDisplayName(tr("Copy application data"));
setDisplayName(tr("Copy application data"));
const QString name = stepDisplayName();
setDefaultDisplayName(name);
setDisplayName(name);
}
AndroidPackageInstallationStep::~AndroidPackageInstallationStep()
@@ -61,7 +68,7 @@ bool AndroidPackageInstallationStep::init()
{
AndroidTarget *androidTarget = qobject_cast<AndroidTarget *>(target());
if (!androidTarget) {
emit addOutput(tr("Current target is not an android target"), BuildStep::MessageOutput);
emit addOutput(tr("Current target is not an Android target"), BuildStep::MessageOutput);
return false;
}