Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.

Fix usage of API that is marked deprecated.

Change-Id: If9622110d9ab2b1796602144ff484cdc3ac1f014
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

10 files changed, 5 insertions, 12 deletions

diff --git a/tests/auto/qsourcelocation/qsourcelocation.pro b/tests/auto/qsourcelocation/qsourcelocation.pro
index 9a87e9b..3c2c8ea 100644
--- a/tests/auto/qsourcelocation/qsourcelocation.pro
+++ b/tests/auto/qsourcelocation/qsourcelocation.pro
@@ -4,4 +4,3 @@ QT += testlib
 SOURCES += tst_qsourcelocation.cpp
 
 include (../xmlpatterns.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
index b5ad007..b72c02b 100644
--- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
+++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp
@@ -336,7 +336,7 @@ void tst_QSourceLocation::withinQVariant() const
 {
     QSourceLocation val;
     const QVariant variant(qVariantFromValue(val));
-    QSourceLocation val2(qVariantValue<QSourceLocation>(variant));
+    QSourceLocation val2(qvariant_cast<QSourceLocation>(variant));
 }
 
 void tst_QSourceLocation::debugStream() const
diff --git a/tests/auto/qxmlitem/qxmlitem.pro b/tests/auto/qxmlitem/qxmlitem.pro
index d7b66fa..db9c8a1 100644
--- a/tests/auto/qxmlitem/qxmlitem.pro
+++ b/tests/auto/qxmlitem/qxmlitem.pro
@@ -4,4 +4,3 @@ QT += testlib
 SOURCES += tst_qxmlitem.cpp
 
 include (../xmlpatterns.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp
index e608847..89768cd 100644
--- a/tests/auto/qxmlitem/tst_qxmlitem.cpp
+++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp
@@ -352,7 +352,7 @@ void tst_QXmlItem::withinQVariant() const
 {
     QXmlItem val;
     const QVariant variant(qVariantFromValue(val));
-    QXmlItem val2(qVariantValue<QXmlItem>(variant));
+    QXmlItem val2(qvariant_cast<QXmlItem>(variant));
 }
 
 QTEST_MAIN(tst_QXmlItem)
diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro
index 54a30a7..7dca9b9 100644
--- a/tests/auto/qxmlquery/qxmlquery.pro
+++ b/tests/auto/qxmlquery/qxmlquery.pro
@@ -24,4 +24,3 @@ wince*: {
 
    DEPLOYMENT += addFiles patternistFiles
 }
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 3350911..30a900f 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1257,12 +1257,12 @@ void tst_QXmlQuery::basicXQueryToQtTypeCheck() const
              * just artifacts created somewhere. */
             if(produced.type() == QVariant::Double)
                 QVERIFY(qFuzzyCompare(produced.toDouble(), expected.toDouble()));
-            else if(qVariantCanConvert<QXmlName>(produced))
+            else if (produced.canConvert<QXmlName>())
             {
                 /* QVariant::operator==() does identity comparison, it doesn't delegate to operator==() of
                  * the contained type, unless it's hardcoded into QVariant. */
-                const QXmlName n1 = qVariantValue<QXmlName>(produced);
-                const QXmlName n2 = qVariantValue<QXmlName>(expected);
+                const QXmlName n1 = qvariant_cast<QXmlName>(produced);
+                const QXmlName n2 = qvariant_cast<QXmlName>(expected);
                 QCOMPARE(n1, n2);
             }
             else
diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
index f8904cc..54aa71d 100644
--- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
+++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro
@@ -25,6 +25,5 @@ wince* {
    DEPLOYMENT += catalog
 }
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
index a1e7896..15c31b6 100644
--- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
+++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro
@@ -22,6 +22,5 @@ INCLUDEPATH += \
     ../xmlpatternsxqts \
     ../xmlpatternssdk
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
index 41e9c68..9040502 100644
--- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
+++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro
@@ -16,6 +16,5 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private      \
 
 QT += xml testlib
 TARGET = tst_xmlpatternsxqts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
index 3df3d78..f9dc1c2 100644
--- a/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
+++ b/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro
@@ -23,4 +23,3 @@ wince*: {
 }
 
 requires(contains(QT_CONFIG,private_tests))
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0