Enums are now available using the QML composite type name

Change-Id: I90cf20d57ee433c1c9319c7a947ac91558775bb7
Task-number: QTBUG-43582
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

3 files changed, 66 insertions, 67 deletions

diff --git a/examples/quick/controls/mirroring/main.qml b/examples/quick/controls/mirroring/main.qml
index b1a339dc..85a19425 100644
--- a/examples/quick/controls/mirroring/main.qml
+++ b/examples/quick/controls/mirroring/main.qml
@@ -222,7 +222,7 @@ ApplicationWindow {
                         }
                         Slider {
                             width: parent.width
-                            snapMode: T.Slider.SnapAlways
+                            snapMode: Slider.SnapAlways
                             stepSize: 0.2
                             value: 0.8
                         }
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 64fa457b..3e15fbf6 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
 
 TestCase {
     id: testCase
@@ -76,7 +75,7 @@ TestCase {
         verify(control)
 
         compare(control.stepSize, 0)
-        compare(control.snapMode, T.Slider.NoSnap)
+        compare(control.snapMode, Slider.NoSnap)
         compare(control.orientation, Qt.Horizontal)
 
         control.destroy()
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index e9b73768..f39676a4 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -83,7 +83,7 @@ TestCase {
         compare(control.currentItem, item)
         control.push(component)
         verify(control.currentItem !== item)
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(control.currentItem, item)
         control.destroy()
     }
@@ -108,23 +108,23 @@ TestCase {
         verify(control)
 
         var item1 = component.createObject(control)
-        compare(item1.T.StackView.status, T.StackView.Inactive)
+        compare(item1.T.StackView.status, StackView.Inactive)
         control.push(item1)
-        compare(item1.T.StackView.status, T.StackView.Active)
+        compare(item1.T.StackView.status, StackView.Active)
 
         var item2 = component.createObject(control)
-        compare(item2.T.StackView.status, T.StackView.Inactive)
+        compare(item2.T.StackView.status, StackView.Inactive)
         control.push(item2)
-        compare(item2.T.StackView.status, T.StackView.Activating)
-        compare(item1.T.StackView.status, T.StackView.Deactivating)
-        tryCompare(item2.T.StackView, "status", T.StackView.Active)
-        tryCompare(item1.T.StackView, "status", T.StackView.Inactive)
+        compare(item2.T.StackView.status, StackView.Activating)
+        compare(item1.T.StackView.status, StackView.Deactivating)
+        tryCompare(item2.T.StackView, "status", StackView.Active)
+        tryCompare(item1.T.StackView, "status", StackView.Inactive)
 
         control.pop()
-        compare(item2.T.StackView.status, T.StackView.Deactivating)
-        compare(item1.T.StackView.status, T.StackView.Activating)
-        tryCompare(item2.T.StackView, "status", T.StackView.Inactive)
-        tryCompare(item1.T.StackView, "status", T.StackView.Active)
+        compare(item2.T.StackView.status, StackView.Deactivating)
+        compare(item1.T.StackView.status, StackView.Activating)
+        tryCompare(item2.T.StackView, "status", StackView.Inactive)
+        tryCompare(item1.T.StackView, "status", StackView.Active)
 
         control.destroy()
     }
@@ -135,16 +135,16 @@ TestCase {
 
         var item1 = component.createObject(control)
         compare(item1.T.StackView.index, -1)
-        control.push(item1, T.StackView.Immediate)
+        control.push(item1, StackView.Immediate)
         compare(item1.T.StackView.index, 0)
 
         var item2 = component.createObject(control)
         compare(item2.T.StackView.index, -1)
-        control.push(item2, T.StackView.Immediate)
+        control.push(item2, StackView.Immediate)
         compare(item2.T.StackView.index, 1)
         compare(item1.T.StackView.index, 0)
 
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(item2.T.StackView.index, -1)
         compare(item1.T.StackView.index, 0)
 
@@ -157,16 +157,16 @@ TestCase {
 
         var item1 = component.createObject(control)
         compare(item1.T.StackView.view, null)
-        control.push(item1, T.StackView.Immediate)
+        control.push(item1, StackView.Immediate)
         compare(item1.T.StackView.view, control)
 
         var item2 = component.createObject(control)
         compare(item2.T.StackView.view, null)
-        control.push(item2, T.StackView.Immediate)
+        control.push(item2, StackView.Immediate)
         compare(item2.T.StackView.view, control)
         compare(item1.T.StackView.view, control)
 
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(item2.T.StackView.view, null)
         compare(item1.T.StackView.view, control)
 
@@ -177,17 +177,17 @@ TestCase {
         var control = stackView.createObject(testCase)
         verify(control)
         compare(control.depth, 0)
-        control.push(item, T.StackView.Immediate)
+        control.push(item, StackView.Immediate)
         compare(control.depth, 1)
-        control.push(item, T.StackView.Immediate)
+        control.push(item, StackView.Immediate)
         compare(control.depth, 2)
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(control.depth, 1)
-        control.push(component, T.StackView.Immediate)
+        control.push(component, StackView.Immediate)
         compare(control.depth, 2)
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(control.depth, 1)
-        control.pop(T.StackView.Immediate) // ignored
+        control.pop(StackView.Immediate) // ignored
         compare(control.depth, 1)
         control.clear()
         compare(control.depth, 0)
@@ -213,12 +213,12 @@ TestCase {
         control.forceActiveFocus()
         verify(control.activeFocus)
 
-        control.push(textField, T.StackView.Immediate)
+        control.push(textField, StackView.Immediate)
         compare(control.currentItem, textField)
         textField.forceActiveFocus()
         verify(textField.activeFocus)
 
-        control.pop(T.StackView.Immediate)
+        control.pop(StackView.Immediate)
         compare(control.currentItem, item)
         verify(control.activeFocus)
         verify(!textField.activeFocus)
@@ -234,9 +234,9 @@ TestCase {
         var item2 = component.createObject(control, {objectName: "2"})
         var item3 = component.createObject(control, {objectName: "3"})
 
-        control.push(item1, T.StackView.Immediate)
-        control.push(item2, T.StackView.Immediate)
-        control.push(item3, T.StackView.Immediate)
+        control.push(item1, StackView.Immediate)
+        control.push(item2, StackView.Immediate)
+        control.push(item3, StackView.Immediate)
 
         compare(control.find(function(item, index) { return index === 0 }), item1)
         compare(control.find(function(item) { return item.objectName === "1" }), item1)
@@ -257,15 +257,15 @@ TestCase {
         var control = stackView.createObject(testCase)
         verify(control)
 
-        control.push([item, component, component], T.StackView.Immediate)
+        control.push([item, component, component], StackView.Immediate)
 
-        verify(control.get(0, T.StackView.DontLoad))
-        compare(control.get(0, T.StackView.ForceLoad), item)
+        verify(control.get(0, StackView.DontLoad))
+        compare(control.get(0, StackView.ForceLoad), item)
 
-        verify(!control.get(1, T.StackView.DontLoad))
+        verify(!control.get(1, StackView.DontLoad))
 
-        verify(control.get(2, T.StackView.DontLoad))
-        verify(control.get(2, T.StackView.ForceLoad))
+        verify(control.get(2, StackView.DontLoad))
+        verify(control.get(2, StackView.ForceLoad))
 
         control.destroy()
     }
@@ -280,42 +280,42 @@ TestCase {
 
         // nothing to push
         ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":60:9: QML StackView: push: nothing to push")
-        compare(control.push(T.StackView.Immediate), null)
+        compare(control.push(StackView.Immediate), null)
 
         // push(item)
         var item1 = component.createObject(control, {objectName:"1"})
-        compare(control.push(item1, T.StackView.Immediate), item1)
+        compare(control.push(item1, StackView.Immediate), item1)
         compare(control.depth, 1)
         compare(control.currentItem, item1)
 
         // push([item])
         var item2 = component.createObject(control, {objectName:"2"})
-        compare(control.push([item2], T.StackView.Immediate), item2)
+        compare(control.push([item2], StackView.Immediate), item2)
         compare(control.depth, 2)
         compare(control.currentItem, item2)
 
         // push(item, {properties})
         var item3 = component.createObject(control)
-        compare(control.push(item3, {objectName:"3"}, T.StackView.Immediate), item3)
+        compare(control.push(item3, {objectName:"3"}, StackView.Immediate), item3)
         compare(item3.objectName, "3")
         compare(control.depth, 3)
         compare(control.currentItem, item3)
 
         // push([item, {properties}])
         var item4 = component.createObject(control)
-        compare(control.push([item4, {objectName:"4"}], T.StackView.Immediate), item4)
+        compare(control.push([item4, {objectName:"4"}], StackView.Immediate), item4)
         compare(item4.objectName, "4")
         compare(control.depth, 4)
         compare(control.currentItem, item4)
 
         // push(component, {properties})
-        var item5 = control.push(component, {objectName:"5"}, T.StackView.Immediate)
+        var item5 = control.push(component, {objectName:"5"}, StackView.Immediate)
         compare(item5.objectName, "5")
         compare(control.depth, 5)
         compare(control.currentItem, item5)
 
         // push([component, {properties}])
-        var item6 = control.push([component, {objectName:"6"}], T.StackView.Immediate)
+        var item6 = control.push([component, {objectName:"6"}], StackView.Immediate)
         compare(item6.objectName, "6")
         compare(control.depth, 6)
         compare(control.currentItem, item6)
@@ -331,34 +331,34 @@ TestCase {
         for (var i = 0; i < 7; ++i)
             items.push(component.createObject(control, {objectName:i}))
 
-        control.push(items, T.StackView.Immediate)
+        control.push(items, StackView.Immediate)
 
         ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":60:9: QML StackView: pop: too many arguments")
         compare(control.pop(1, 2, 3), null)
 
         // pop the top most item
-        compare(control.pop(T.StackView.Immediate), items[6])
+        compare(control.pop(StackView.Immediate), items[6])
         compare(control.depth, 6)
         compare(control.currentItem, items[5])
 
         // pop down to (but not including) the Nth item
-        compare(control.pop(items[3], T.StackView.Immediate), items[5])
+        compare(control.pop(items[3], StackView.Immediate), items[5])
         compare(control.depth, 4)
         compare(control.currentItem, items[3])
 
         // pop the top most item
-        compare(control.pop(undefined, T.StackView.Immediate), items[3])
+        compare(control.pop(undefined, StackView.Immediate), items[3])
         compare(control.depth, 3)
         compare(control.currentItem, items[2])
 
         // don't pop non-existent item
         ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":60:9: QML StackView: pop: unknown argument: " + testCase)
-        compare(control.pop(testCase, T.StackView.Immediate), null)
+        compare(control.pop(testCase, StackView.Immediate), null)
         compare(control.depth, 3)
         compare(control.currentItem, items[2])
 
         // pop all items down to (but not including) the 1st item
-        control.pop(null, T.StackView.Immediate)
+        control.pop(null, StackView.Immediate)
         compare(control.depth, 1)
         compare(control.currentItem, items[0])
 
@@ -375,42 +375,42 @@ TestCase {
 
         // nothing to push
         ignoreWarning(Qt.resolvedUrl("tst_stackview.qml") + ":60:9: QML StackView: replace: nothing to push")
-        compare(control.replace(T.StackView.Immediate), null)
+        compare(control.replace(StackView.Immediate), null)
 
         // replace(item)
         var item1 = component.createObject(control, {objectName:"1"})
-        compare(control.replace(item1, T.StackView.Immediate), item1)
+        compare(control.replace(item1, StackView.Immediate), item1)
         compare(control.depth, 1)
         compare(control.currentItem, item1)
 
         // replace([item])
         var item2 = component.createObject(control, {objectName:"2"})
-        compare(control.replace([item2], T.StackView.Immediate), item2)
+        compare(control.replace([item2], StackView.Immediate), item2)
         compare(control.depth, 1)
         compare(control.currentItem, item2)
 
         // replace(item, {properties})
         var item3 = component.createObject(control)
-        compare(control.replace(item3, {objectName:"3"}, T.StackView.Immediate), item3)
+        compare(control.replace(item3, {objectName:"3"}, StackView.Immediate), item3)
         compare(item3.objectName, "3")
         compare(control.depth, 1)
         compare(control.currentItem, item3)
 
         // replace([item, {properties}])
         var item4 = component.createObject(control)
-        compare(control.replace([item4, {objectName:"4"}], T.StackView.Immediate), item4)
+        compare(control.replace([item4, {objectName:"4"}], StackView.Immediate), item4)
         compare(item4.objectName, "4")
         compare(control.depth, 1)
         compare(control.currentItem, item4)
 
         // replace(component, {properties})
-        var item5 = control.replace(component, {objectName:"5"}, T.StackView.Immediate)
+        var item5 = control.replace(component, {objectName:"5"}, StackView.Immediate)
         compare(item5.objectName, "5")
         compare(control.depth, 1)
         compare(control.currentItem, item5)
 
         // replace([component, {properties}])
-        var item6 = control.replace([component, {objectName:"6"}], T.StackView.Immediate)
+        var item6 = control.replace([component, {objectName:"6"}], StackView.Immediate)
         compare(item6.objectName, "6")
         compare(control.depth, 1)
         compare(control.currentItem, item6)
@@ -430,7 +430,7 @@ TestCase {
         verify(control)
 
         var item1 = component.createObject(control)
-        control.push(item1, T.StackView.Immediate)
+        control.push(item1, StackView.Immediate)
         verify(item1.visible)
 
         var item2 = component.createObject(control)
@@ -504,12 +504,12 @@ TestCase {
 
     function test_ownership_data() {
         return [
-            {tag:"item, transition", arg: indestructibleItem, operation: T.StackView.Transition, destroyed: false},
-            {tag:"item, immediate", arg: indestructibleItem, operation: T.StackView.Immediate, destroyed: false},
-            {tag:"component, transition", arg: destructibleComponent, operation: T.StackView.Transition, destroyed: true},
-            {tag:"component, immediate", arg: destructibleComponent, operation: T.StackView.Immediate, destroyed: true},
-            {tag:"url, transition", arg: Qt.resolvedUrl("TestItem.qml"), operation: T.StackView.Transition, destroyed: true},
-            {tag:"url, immediate", arg: Qt.resolvedUrl("TestItem.qml"), operation: T.StackView.Immediate, destroyed: true}
+            {tag:"item, transition", arg: indestructibleItem, operation: StackView.Transition, destroyed: false},
+            {tag:"item, immediate", arg: indestructibleItem, operation: StackView.Immediate, destroyed: false},
+            {tag:"component, transition", arg: destructibleComponent, operation: StackView.Transition, destroyed: true},
+            {tag:"component, immediate", arg: destructibleComponent, operation: StackView.Immediate, destroyed: true},
+            {tag:"url, transition", arg: Qt.resolvedUrl("TestItem.qml"), operation: StackView.Transition, destroyed: true},
+            {tag:"url, immediate", arg: Qt.resolvedUrl("TestItem.qml"), operation: StackView.Immediate, destroyed: true}
         ]
     }
 
@@ -518,7 +518,7 @@ TestCase {
         verify(control)
 
         // push-pop
-        control.push(data.arg, T.StackView.Immediate)
+        control.push(data.arg, StackView.Immediate)
         verify(control.currentItem)
         verify(control.currentItem.hasOwnProperty("destroyedCallback"))
         var destroyed = false
@@ -529,7 +529,7 @@ TestCase {
         compare(destroyed, data.destroyed)
 
         // push-replace
-        control.push(data.arg, T.StackView.Immediate)
+        control.push(data.arg, StackView.Immediate)
         verify(control.currentItem)
         verify(control.currentItem.hasOwnProperty("destroyedCallback"))
         destroyed = false