build without QT_DISABLE_DEPRECATED_BEFORE=0

Change-Id: I76f23c2bb29bba1bcdb9f49cecc7aba36716161f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro
index 7da0e42..ba69b7f 100644 (file)
--- 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 (file)
--- 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