Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.

Fix usage of API that is marked deprecated.

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

20 files changed, 20 insertions, 26 deletions

diff --git a/tests/auto/quick/qquickanchors/qquickanchors.pro b/tests/auto/quick/qquickanchors/qquickanchors.pro
index 184066753b..b20e1224ea 100644
--- a/tests/auto/quick/qquickanchors/qquickanchors.pro
+++ b/tests/auto/quick/qquickanchors/qquickanchors.pro
@@ -12,4 +12,3 @@ TESTDATA = data/*
 CONFIG += parallel_test
 
 QT += core-private gui-private qml-private quick-private  testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickflickable/qquickflickable.pro b/tests/auto/quick/qquickflickable/qquickflickable.pro
index 88dc2fbc2a..99a840218d 100644
--- a/tests/auto/quick/qquickflickable/qquickflickable.pro
+++ b/tests/auto/quick/qquickflickable/qquickflickable.pro
@@ -10,4 +10,3 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private  qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro
index 9ec643dc4d..7a4b7302d0 100644
--- a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro
+++ b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro
@@ -10,4 +10,3 @@ macx:CONFIG -= app_bundle
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro
index 3b98ed4dea..3c33cc78fb 100644
--- a/tests/auto/quick/qquickgridview/qquickgridview.pro
+++ b/tests/auto/quick/qquickgridview/qquickgridview.pro
@@ -12,4 +12,3 @@ TESTDATA = data/*
 
 QT += core-private gui-private  qml-private quick-private testlib
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro
index 9581ae02d1..5b1059bd24 100644
--- a/tests/auto/quick/qquickimage/qquickimage.pro
+++ b/tests/auto/quick/qquickimage/qquickimage.pro
@@ -12,4 +12,3 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private network testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro
index 1d8ae0148b..9aca5926f2 100644
--- a/tests/auto/quick/qquickitem/qquickitem.pro
+++ b/tests/auto/quick/qquickitem/qquickitem.pro
@@ -11,4 +11,3 @@ TESTDATA = data/*
 
 QT += core-private gui-private  qml-private quick-private testlib
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro
index c9b634b9e8..a95b6fdf33 100644
--- a/tests/auto/quick/qquicklistview/qquicklistview.pro
+++ b/tests/auto/quick/qquicklistview/qquicklistview.pro
@@ -18,5 +18,4 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private  testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
diff --git a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro
index 5724a7179e..6c0b10bb88 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro
+++ b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro
@@ -11,4 +11,3 @@ include(../../shared/util.pri)
 include(../shared/util.pri)
 
 QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index e6cf9a488f..90c1eb0c67 100644
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -11,4 +11,3 @@ TESTDATA = data/*
 
 QT += core-private gui-private  qml-private quick-private testlib
 qtHaveModule(widgets): QT += widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpincharea/qquickpincharea.pro b/tests/auto/quick/qquickpincharea/qquickpincharea.pro
index fa14afa261..15095b53a5 100644
--- a/tests/auto/quick/qquickpincharea/qquickpincharea.pro
+++ b/tests/auto/quick/qquickpincharea/qquickpincharea.pro
@@ -11,4 +11,3 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
index f6a046e622..6e85ba9db8 100644
--- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro
+++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro
@@ -10,4 +10,3 @@ macx:CONFIG -= app_bundle
 TESTDATA = data/*
 
 QT += testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickrectangle/qquickrectangle.pro b/tests/auto/quick/qquickrectangle/qquickrectangle.pro
index e881926c80..daefb5fe75 100644
--- a/tests/auto/quick/qquickrectangle/qquickrectangle.pro
+++ b/tests/auto/quick/qquickrectangle/qquickrectangle.pro
@@ -10,4 +10,3 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickrepeater/qquickrepeater.pro b/tests/auto/quick/qquickrepeater/qquickrepeater.pro
index a27c34c84b..eb1c9fe9b1 100644
--- a/tests/auto/quick/qquickrepeater/qquickrepeater.pro
+++ b/tests/auto/quick/qquickrepeater/qquickrepeater.pro
@@ -11,4 +11,3 @@ TESTDATA = data/*
 
 CONFIG += parallel_test
 QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index d9aff688ab..9222e39477 100644
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -11,4 +11,3 @@ TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
 qtHaveModule(widgets): QT += widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index d578a0900c..a1d8779555 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -102,15 +102,20 @@ public:
     };
 
     SingleRoleModel(const QStringList &list = QStringList(), const QByteArray &role = "name", QObject *parent = 0)
-        : QAbstractItemModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles.insert(Qt::DisplayRole , role);
-        setRoleNames(roles);
+        : QAbstractItemModel(parent), m_role(role)
+    {
         foreach (const QString &string, list)
             trunk.children.append(Node(string));
     }
     ~SingleRoleModel() {}
 
+    QHash<int,QByteArray> roleNames() const
+    {
+        QHash<int,QByteArray> roles;
+        roles.insert(Qt::DisplayRole, m_role);
+        return roles;
+    }
+
     Branch *branchForIndex(const QModelIndex &index) const {
         return index.isValid()
                 ? static_cast<Branch *>(index.internalPointer())->children.at(index.row()).branch
@@ -235,6 +240,7 @@ public slots:
     }
 
 private:
+    const QByteArray m_role;
     Branch trunk;
 };
 
diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro
index e95b7dbb10..f0d287f30f 100644
--- a/tests/auto/quick/qquickwindow/qquickwindow.pro
+++ b/tests/auto/quick/qquickwindow/qquickwindow.pro
@@ -17,5 +17,3 @@ OTHER_FILES += \
     data/Headless.qml \
     data/showHideAnimate.qml \
     data/windoworder.qml
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index e1ea068a62..0ac15c28ce 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -393,7 +393,7 @@ void tst_qquickwindow::openglContextCreatedSignal()
     QVERIFY(spy.size() > 0);
 
     QVariant ctx = spy.at(0).at(0);
-    QCOMPARE(qVariantValue<QOpenGLContext *>(ctx), window.openglContext());
+    QCOMPARE(qvariant_cast<QOpenGLContext *>(ctx), window.openglContext());
 }
 
 void tst_qquickwindow::aboutToStopSignal()
diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 86d61a0c23..0ba81cf2ef 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -148,10 +148,6 @@ QList<int> QQuickViewTestUtil::adjustIndexesForRemoveDisplaced(const QList<int>
 QQuickViewTestUtil::QaimModel::QaimModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    QHash<int, QByteArray> roles;
-    roles[Name] = "name";
-    roles[Number] = "number";
-    setRoleNames(roles);
 }
 
 int QQuickViewTestUtil::QaimModel::rowCount(const QModelIndex &parent) const
@@ -160,6 +156,14 @@ int QQuickViewTestUtil::QaimModel::rowCount(const QModelIndex &parent) const
     return list.count();
 }
 
+QHash<int,QByteArray> QQuickViewTestUtil::QaimModel::roleNames() const
+{
+    QHash<int,QByteArray> roles = QAbstractListModel::roleNames();
+    roles.insert(Name, "name");
+    roles.insert(Number, "number");
+    return roles;
+}
+
 QVariant QQuickViewTestUtil::QaimModel::data(const QModelIndex &index, int role) const
 {
     QVariant rv;
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 1643eca979..1de2f54d8a 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -80,6 +80,7 @@ namespace QQuickViewTestUtil
 
         int rowCount(const QModelIndex &parent=QModelIndex()) const;
         QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const;
+        QHash<int,QByteArray> roleNames() const;
 
         int count() const;
         QString name(int index) const;
diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro
index 7d23dfc0ae..0df9bc53d3 100644
--- a/tests/auto/quick/touchmouse/touchmouse.pro
+++ b/tests/auto/quick/touchmouse/touchmouse.pro
@@ -14,4 +14,3 @@ TESTDATA = data/*
 
 # OTHER_FILES += data/foo.qml
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0