Skip to content

Commit

Permalink
Compile after API changes in QCoreApplication
Browse files Browse the repository at this point in the history
Change-Id: I6bc6978a5c68503facd8085bd35e66f86af58a90
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
  • Loading branch information
Gunnar Sletta authored and Qt by Nokia committed Mar 7, 2012
1 parent ee9cac7 commit a85e66b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/qml/qml/v8/qqmlbuiltinfunctions.cpp
Expand Up @@ -1188,9 +1188,7 @@ v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
QCoreApplication::Encoding encoding = QCoreApplication::UnicodeUTF8;
if (args.Length() > 3) {
QString encStr = v8engine->toString(args[3]);
if (encStr == QLatin1String("CodecForTr")) {
encoding = QCoreApplication::CodecForTr;
} else if (encStr == QLatin1String("UnicodeUTF8")) {
if (encStr == QLatin1String("UnicodeUTF8")) {
encoding = QCoreApplication::UnicodeUTF8;
} else {
QString msg = QString::fromLatin1("qsTranslate(): invalid encoding '%0'").arg(encStr);
Expand Down

0 comments on commit a85e66b

Please sign in to comment.