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

Fix tr() error in Android plugin, use QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-07-16 11:04:42 +02:00
committed by Daniel Teske
parent 2cdfad5539
commit 29a65750f6
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -85,7 +85,7 @@ public:
QPair<QString, QString> item;
while (from > -1) {
from += 11;// strlen(AliasString);
const int eol = rowCertificates.indexOf(QLatin1String("\n"), from);
const int eol = rowCertificates.indexOf(QLatin1Char('\n'), from);
item.first = rowCertificates.mid(from, eol - from).trimmed();
const int eoc = rowCertificates.indexOf(CertificateSeparator, eol);
item.second = rowCertificates.mid(eol + 1, eoc - eol - 2).trimmed();
@@ -433,7 +433,7 @@ bool AndroidPackageCreationStep::createPackage()
return false;
}
keyPass += "\n";
keyPass += '\n';
buildProc->write(keyPass);
buildProc->waitForBytesWritten();
buildProc->waitForFinished();