From ea8bceec7f449e3f78436e02bb2d06a028cff2a8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Aug 2013 13:23:51 +0200 Subject: [PATCH] build without QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: I76f23c2bb29bba1bcdb9f49cecc7aba36716161f Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- tests/auto/linguist/lrelease/lrelease.pro | 1 - tests/auto/linguist/lrelease/tst_lrelease.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro index 7da0e42..ba69b7f 100644 --- a/tests/auto/linguist/lrelease/lrelease.pro +++ b/tests/auto/linguist/lrelease/lrelease.pro @@ -3,4 +3,3 @@ QT = core testlib TARGET = tst_lrelease SOURCES += tst_lrelease.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp index f53eca3..3542d25 100644 --- a/tests/auto/linguist/lrelease/tst_lrelease.cpp +++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp @@ -141,11 +141,11 @@ void tst_lrelease::translate() QCOMPARE(QCoreApplication::translate("", "Test", "Empty context"), QString("AAAA")); // Test plurals - QString txed = QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 0); + QString txed = QCoreApplication::translate("Plurals", "There are %n houses", 0, 0); QCOMPARE(QString::fromLatin1("[%1]").arg(txed), QString("[There are 0 houses]")); - QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 1), QString("There is 1 house")); - QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 2), QString("There are 2 houses")); - QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 3), QString("There are 3 houses")); + QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 1), QString("There is 1 house")); + QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 2), QString("There are 2 houses")); + QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 3), QString("There are 3 houses")); // More plurals -- 2.7.4