Templatize the former extras

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

2 files changed, 15 insertions, 13 deletions

diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index a4dd41dd..40e7dfa0 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -41,6 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
+import QtQuick.Templates 2.0 as T
 
 TestCase {
     id: testCase
@@ -404,9 +405,9 @@ TestCase {
         id: pageAttached
 
         Text {
-            property int index: AbstractSwipeView.index
-            property SwipeView view: AbstractSwipeView.view
-            property bool isCurrentItem: AbstractSwipeView.isCurrentItem
+            property int index: T.SwipeView.index
+            property SwipeView view: T.SwipeView.view
+            property bool isCurrentItem: T.SwipeView.isCurrentItem
         }
     }
 
@@ -425,13 +426,13 @@ TestCase {
         compare(control.count, titles.length)
         for (i = 0; i < control.count; ++i) {
             compare(control.itemAt(i).text, titles[i])
-            compare(control.itemAt(i).AbstractSwipeView.index, i)
-            compare(control.itemAt(i).AbstractSwipeView.isCurrentItem, i === 0)
+            compare(control.itemAt(i).T.SwipeView.index, i)
+            compare(control.itemAt(i).T.SwipeView.isCurrentItem, i === 0)
         }
 
         control.currentIndex = data.currentBefore
         for (i = 0; i < control.count; ++i) {
-            compare(control.itemAt(i).AbstractSwipeView.isCurrentItem, i === data.currentBefore)
+            compare(control.itemAt(i).T.SwipeView.isCurrentItem, i === data.currentBefore)
         }
 
         control.moveItem(data.from, data.to)
@@ -446,8 +447,8 @@ TestCase {
         compare(control.count, titles.length)
         for (i = 0; i < control.count; ++i) {
             compare(control.itemAt(i).text, titles[i])
-            compare(control.itemAt(i).AbstractSwipeView.index, i);
-            compare(control.itemAt(i).AbstractSwipeView.isCurrentItem, i === data.currentAfter)
+            compare(control.itemAt(i).T.SwipeView.index, i);
+            compare(control.itemAt(i).T.SwipeView.isCurrentItem, i === data.currentAfter)
         }
 
         control.destroy()
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index e73d0ed7..97430681 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -41,6 +41,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
+import QtQuick.Templates 2.0 as T
 
 TestCase {
     id: testCase
@@ -286,7 +287,7 @@ TestCase {
     property Component displacementDelegate: Text {
         objectName: "delegate" + index
         text: modelData
-        opacity: 0.2 + Math.max(0, 1 - Math.abs(AbstractTumbler.displacement)) * 0.8
+        opacity: 0.2 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.8
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
 
@@ -295,7 +296,7 @@ TestCase {
             anchors.right: parent.right
         }
 
-        property real displacement: AbstractTumbler.displacement
+        property real displacement: T.Tumbler.displacement
     }
 
     function test_displacement(data) {
@@ -531,16 +532,16 @@ TestCase {
     }
 
     property Component wrongDelegateTypeComponent: QtObject {
-        property real displacement: AbstractTumbler.displacement
+        property real displacement: T.Tumbler.displacement
     }
 
     property Component noParentDelegateComponent: Item {
-        property real displacement: AbstractTumbler.displacement
+        property real displacement: T.Tumbler.displacement
     }
 
     property Component gridViewComponent: GridView {}
     property Component simpleDisplacementDelegate: Text {
-        property real displacement: AbstractTumbler.displacement
+        property real displacement: T.Tumbler.displacement
         property int index: -1
     }