git.iko.soy/unity8
on xenial help sign in
Changes 'shareData' and 'contentType' attributes to 'share-data' and 'content-type', to match existing naming schema.
b167ec9Pawel Stolowski
qml/Dash/Previews/PreviewSharing.qml+1−1
compare with xenial
unifiedsplit
@@ -25,7 +25,7 @@ Item {
25
25
26 property var shareData
26 property var shareData
27 readonly property bool isUrlExternal: url && url.indexOf("file:///") != 0 && url.indexOf("/") != 0
27 readonly property bool isUrlExternal: url && url.indexOf("file:///") != 0 && url.indexOf("/") != 0
28− readonly property string contentType: shareData ? shareData["contentType"] : ""
28+ readonly property string contentType: shareData ? shareData["content-type"] : ""
29 readonly property var url: shareData ? shareData["uri"] : ""
29 readonly property var url: shareData ? shareData["uri"] : ""
30 readonly property Item rootItem: QuickUtils.rootItem(root)
30 readonly property Item rootItem: QuickUtils.rootItem(root)
31
31
qml/Dash/Previews/PreviewVideoPlayback.qml+1−1
@@ -81,7 +81,7 @@ PreviewWidget {
81 right: parent.right
81 right: parent.right
82 bottom: parent.bottom
82 bottom: parent.bottom
83 }
83 }
84− shareData: widgetData["shareData"]
84+ shareData: widgetData["share-data"]
85 }
85 }
86 }
86 }
87}
87}
qml/Dash/Previews/PreviewZoomableImage.qml+1−1
@@ -72,7 +72,7 @@ PreviewWidget {
72 right: parent.right
72 right: parent.right
73 bottom: parent.bottom
73 bottom: parent.bottom
74 }
74 }
75− shareData: widgetData["shareData"]
75+ shareData: widgetData["share-data"]
76 }
76 }
77 }
77 }
78
78
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml+2−2
@@ -32,12 +32,12 @@ Rectangle {
32 "text here 2",
32 "text here 2",
33 "text here 3"
33 "text here 3"
34 ],
34 ],
35− "contentType": "text"
35+ "content-type": "text"
36 }
36 }
37
37
38 property var shareDataNoUri: {
38 property var shareDataNoUri: {
39 "uri": "",
39 "uri": "",
40− "contentType": "text"
40+ "content-type": "text"
41 }
41 }
42
42
43 PreviewSharing {
43 PreviewSharing {