Attached properties are now available using the QML composite type name

Change-Id: I8cfbd420cea4e01528d2f289cfc5989268d8718a
Task-number: QTBUG-43581
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

6 files changed, 12 insertions, 18 deletions

diff --git a/examples/labs/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml
index ab0b3085..091cf267 100644
--- a/examples/labs/calendar/DateTimePicker.qml
+++ b/examples/labs/calendar/DateTimePicker.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.6
 import Qt.labs.calendar 1.0
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
 
 Item {
     id: dateTimePicker
@@ -86,7 +85,7 @@ Item {
 
                     delegate: TumblerDelegate {
                         text: modelData
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
 
                     function updateModel() {
@@ -107,7 +106,7 @@ Item {
                     model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
                     delegate: TumblerDelegate {
                         text: modelData
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
                     onCurrentIndexChanged: dayTumbler.updateModel()
                 }
@@ -123,7 +122,7 @@ Item {
                     }
                     delegate: TumblerDelegate {
                         text: modelData
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
                 }
             }
@@ -138,7 +137,7 @@ Item {
                     model: 12
                     delegate: TumblerDelegate {
                         text: modelData.toString().length < 2 ? "0" + modelData : modelData
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
                 }
 
@@ -147,7 +146,7 @@ Item {
                     model: 60
                     delegate: TumblerDelegate {
                         text: modelData.toString().length < 2 ? "0" + modelData : modelData
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
                 }
 
@@ -155,7 +154,7 @@ Item {
                     id: amPmTumbler
                     model: ["AM", "PM"]
                     delegate: TumblerDelegate {
-                        font.pixelSize: fontMetrics.font.pixelSize * (T.Tumbler.tumbler.activeFocus ? 2 : 1.25)
+                        font.pixelSize: fontMetrics.font.pixelSize * (Tumbler.tumbler.activeFocus ? 2 : 1.25)
                     }
 
                     contentItem: ListView {
diff --git a/examples/labs/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml
index e7d3ee47..e379e8c0 100644
--- a/examples/labs/calendar/TumblerDelegate.qml
+++ b/examples/labs/calendar/TumblerDelegate.qml
@@ -40,12 +40,11 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
 
 Text {
     text: isNaN(modelData) ? modelData : modelData + 1
     color: "#666666"
-    opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6
+    opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
     horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter
 
diff --git a/examples/labs/calendar/main.qml b/examples/labs/calendar/main.qml
index 9b4e6f9a..bc3ca51b 100644
--- a/examples/labs/calendar/main.qml
+++ b/examples/labs/calendar/main.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.6
 import Qt.labs.controls 1.0
 import Qt.labs.calendar 1.0
-import Qt.labs.templates 1.0 as T
 import QtQuick.Layouts 1.0
 import io.qt.examples.calendar 1.0
 
@@ -182,7 +181,7 @@ ApplicationWindow {
 
         ColumnLayout {
             spacing: 10
-            visible: T.StackView.index === stackView.currentIndex
+            visible: StackView.index === stackView.currentIndex
 
             DateTimePicker {
                 id: dateTimePicker
diff --git a/examples/labs/controls/mirroring/main.qml b/examples/labs/controls/mirroring/main.qml
index 835304a8..3cc6f502 100644
--- a/examples/labs/controls/mirroring/main.qml
+++ b/examples/labs/controls/mirroring/main.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.0
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
 
 ApplicationWindow {
     id: window
@@ -233,6 +232,6 @@ ApplicationWindow {
             Item { width: 1; height: 12 }
         }
 
-        T.ScrollIndicator.vertical: ScrollIndicator { anchors.right: parent.right }
+        ScrollIndicator.vertical: ScrollIndicator { anchors.right: parent.right }
     }
 }
diff --git a/examples/labs/controls/tabs/main.qml b/examples/labs/controls/tabs/main.qml
index 50fcde16..ceebc622 100644
--- a/examples/labs/controls/tabs/main.qml
+++ b/examples/labs/controls/tabs/main.qml
@@ -41,7 +41,6 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.0
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
 import QtQuick.XmlListModel 2.0
 
 ApplicationWindow {
@@ -180,7 +179,7 @@ ApplicationWindow {
                     }
                 }
 
-                T.ScrollIndicator.vertical: ScrollIndicator { }
+                ScrollIndicator.vertical: ScrollIndicator { }
             }
 
             BusyIndicator {
@@ -272,7 +271,7 @@ ApplicationWindow {
                     }
                 }
 
-                T.ScrollIndicator.vertical: ScrollIndicator { }
+                ScrollIndicator.vertical: ScrollIndicator { }
             }
 
             BusyIndicator {
diff --git a/examples/labs/controls/theme/main.qml b/examples/labs/controls/theme/main.qml
index d3a3f7a0..3b970f58 100644
--- a/examples/labs/controls/theme/main.qml
+++ b/examples/labs/controls/theme/main.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.6
 import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
 
 ApplicationWindow {
     id: window
@@ -168,7 +167,7 @@ ApplicationWindow {
                     }
                 }
 
-                T.ScrollIndicator.vertical: ScrollIndicator { }
+                ScrollIndicator.vertical: ScrollIndicator { }
             }
         }
     }