1 files changed, 40 insertions, 21 deletions

diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 13898ace7b..e5a6e953d3 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -36,7 +36,7 @@ class tst_QChar : public QObject
 {
     Q_OBJECT
 private slots:
-    void operator_eqeq_int();
+    void operator_eqeq_null();
     void operators_data();
     void operators();
     void toUpper();
@@ -72,35 +72,54 @@ private slots:
     void unicodeVersion();
 };
 
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-void tst_QChar::operator_eqeq_int()
+void tst_QChar::operator_eqeq_null()
 {
     {
         const QChar ch = QLatin1Char(' ');
-        QVERIFY(ch != 0);
-        QVERIFY(!(ch == 0));
-
-        QVERIFY(ch == 0x20);
-        QVERIFY(!(ch != 0x20));
-        QVERIFY(0x20 == ch);
-        QVERIFY(!(0x20 != ch));
+#define CHECK(NUL) \
+        do { \
+            QVERIFY(!(ch  == NUL)); \
+            QVERIFY(  ch  != NUL ); \
+            QVERIFY(!(ch  <  NUL)); \
+            QVERIFY(  ch  >  NUL ); \
+            QVERIFY(!(ch  <= NUL)); \
+            QVERIFY(  ch  >= NUL ); \
+            QVERIFY(!(NUL == ch )); \
+            QVERIFY(  NUL != ch  ); \
+            QVERIFY(  NUL <  ch  ); \
+            QVERIFY(!(NUL >  ch )); \
+            QVERIFY(  NUL <= ch  ); \
+            QVERIFY(!(NUL >= ch )); \
+        } while (0)
+
+        CHECK(0);
+        CHECK('\0');
+#undef CHECK
     }
     {
         const QChar ch = QLatin1Char('\0');
-        QVERIFY(ch == 0);
-        QVERIFY(!(ch != 0));
-
-        QVERIFY(ch != 0x20);
-        QVERIFY(!(ch == 0x20));
-        QVERIFY(0x20 != ch);
-        QVERIFY(!(0x20 == ch));
+#define CHECK(NUL) \
+        do { \
+            QVERIFY(  ch  == NUL ); \
+            QVERIFY(!(ch  != NUL)); \
+            QVERIFY(!(ch  <  NUL)); \
+            QVERIFY(!(ch  >  NUL)); \
+            QVERIFY(  ch  <= NUL ); \
+            QVERIFY(  ch  >= NUL ); \
+            QVERIFY(  NUL == ch  ); \
+            QVERIFY(!(NUL != ch )); \
+            QVERIFY(!(NUL <  ch )); \
+            QVERIFY(!(NUL >  ch )); \
+            QVERIFY(  NUL <= ch  ); \
+            QVERIFY(  NUL >= ch  ); \
+        } while (0)
+
+        CHECK(0);
+        CHECK('\0');
+#undef CHECK
     }
 }
 
-QT_WARNING_POP
-
 void tst_QChar::operators_data()
 {
     QTest::addColumn<QChar>("lhs");