1
=== modified file 'apicheck/apicheck.cpp'
2
--- apicheck/apicheck.cpp	2016-03-17 21:11:09 +0000
3
+++ apicheck/apicheck.cpp	2016-07-04 16:15:32 +0000
4
@@ -38,6 +38,7 @@
5
38
#include <QJsonObject>
38
#include <QJsonObject>
6
39
#include <QJsonArray>
39
#include <QJsonArray>
7
40
#include <QLoggingCategory>
40
#include <QLoggingCategory>
8
41
#include <QRegularExpression>
9
41
42
10
42
#define foreach Q_FOREACH
43
#define foreach Q_FOREACH
11
43
#include <QtQml/private/qqmlengine_p.h>
44
#include <QtQml/private/qqmlengine_p.h>
12
@@ -140,30 +141,37 @@
13
140
*/
141
*/
14
141
QByteArray convertToId(const QString &cppName)
142
QByteArray convertToId(const QString &cppName)
15
142
{
143
{
17
143
    QString qmlType(cppName);
144
    QString qmlType(QString(qPrintable(cppName)).replace(QRegExp("(QQmlListProperty|QList)<(.+)>"), "\\2"));
18
145
    QString typeFormat(qmlType != cppName ? "list<%1>" : "%1");
19
146
20
147
    QList<const QQmlType*>types(qmlTypesByCppName[qPrintable(qmlType)].toList());
21
148
    std::sort(types.begin(), types.end(), typeNameSort);
22
149
23
144
    if (qmlType.contains("::")) {
150
    if (qmlType.contains("::")) {
24
145
        QStringList parts(qmlType.split("::"));
151
        QStringList parts(qmlType.split("::"));
26
146
        return qPrintable(convertToId(parts[0]) + "." + convertToId(parts[1]));
152
        // Enum or Flags
27
153
        if (parts.length() > 2) {
28
154
            qmlType = convertToId(parts[0] + "::" + parts[1]) + "." + parts[2];
29
155
        } else {
30
156
            // Namespace
31
157
            qmlType = parts[1];
32
158
            // FIXME: Namespaces in properties?
33
159
            if (parts[0] == "Qt" || parts[0] == "RenderTimer")
34
160
                return qPrintable(typeFormat.arg(parts[0] + "." + qmlType));
35
161
        }
36
147
    }
162
    }
37
148
163
44
149
    QList<const QQmlType*>types(qmlTypesByCppName[qPrintable(cppName)].toList());
164
    if (types.isEmpty())
45
150
    std::sort(types.begin(), types.end(), typeNameSort);
165
        qmlType = cppToId.value(qPrintable(qmlType), qPrintable(qmlType));
46
151
    if (!types.isEmpty())
166
    else {
47
152
        qmlType = QString(types[0]->qmlTypeName()).split("/")[1].toUtf8();
167
        // Cache QML type name
48
153
    else
168
        QString newQmlType(QString(types[0]->qmlTypeName()).split("/")[1].toUtf8());
49
154
        qmlType = cppToId.value(qPrintable(qmlType), qPrintable(cppName));
169
        cppToId.insert(qPrintable(qmlType), qPrintable(newQmlType));
50
170
        qmlType = newQmlType;
51
171
    }
52
155
    // Strip internal _QMLTYPE_xy suffix
172
    // Strip internal _QMLTYPE_xy suffix
53
156
    qmlType = qmlType.split("_")[0];
173
    qmlType = qmlType.split("_")[0];
64
157
    // List type
174
    return qPrintable(typeFormat.arg(qmlType));
55
158
    if (qmlType.startsWith("QQmlListProperty<")) {
56
159
        QString subType(qmlType.mid(17, qmlType.size() - 18));
57
160
        qmlType = "list<" + convertToId(subType) + ">";
58
161
    }
59
162
    else if (qmlType.startsWith("QList<")) {
60
163
        QString subType(qmlType.mid(6, qmlType.size() - 7));
61
164
        qmlType = "list<" + convertToId(subType) + ">";
62
165
    }
63
166
    return qPrintable(qmlType.replace("QTestRootObject", "QtObject"));
65
167
}
175
}
66
168
176
67
169
QByteArray convertToId(const QMetaObject *mo)
177
QByteArray convertToId(const QMetaObject *mo)
68
@@ -626,7 +634,7 @@
69
626
        // Two leading underscores: internal API
634
        // Two leading underscores: internal API
70
627
        if (name.startsWith("__"))
635
        if (name.startsWith("__"))
71
628
            return;
636
            return;
73
629
        const QString typeName = meth.typeName();
637
        QString typeName = meth.typeName();
74
630
638
75
631
        if (implicitSignals.contains(name)
639
        if (implicitSignals.contains(name)
76
632
                && !meth.revision()
640
                && !meth.revision()
77
@@ -652,6 +660,8 @@
78
652
        if (revision && object->contains("#version"))
660
        if (revision && object->contains("#version"))
79
653
            method["version"] = object->value("#version").toString();
661
            method["version"] = object->value("#version").toString();
80
654
662
81
663
        if (typeName.endsWith("*"))
82
664
            typeName.truncate(typeName.size() - 1);
83
655
        if (typeName != QLatin1String("void"))
665
        if (typeName != QLatin1String("void"))
84
656
            method["returns"] = typeName;
666
            method["returns"] = typeName;
85
657
667
86
@@ -850,6 +860,7 @@
87
850
    cppToId.insert("QPoint", "Qt.point");
860
    cppToId.insert("QPoint", "Qt.point");
88
851
    cppToId.insert("QColor", "color");
861
    cppToId.insert("QColor", "color");
89
852
    cppToId.insert("QQmlEasingValueType::Type", "Type");
862
    cppToId.insert("QQmlEasingValueType::Type", "Type");
90
863
    cppToId.insert("QTestRootObject", "QtObject");
91
853
864
92
854
    // find a valid QtQuick import
865
    // find a valid QtQuick import
93
855
    QByteArray importCode;
866
    QByteArray importCode;
94
856
867
95
=== modified file 'components.api'
96
--- components.api	2016-06-27 10:03:01 +0000
97
+++ components.api	2016-07-04 16:15:32 +0000
98
@@ -1,14 +1,14 @@
100
1
Ubuntu.Components.AbstractButton 1.0 0.1: UbuntuToolkit.UCActionItem
1
Ubuntu.Components.AbstractButton 1.0 0.1: ActionItem
101
2
    property bool hovered
2
    property bool hovered
102
3
    signal clicked()
3
    signal clicked()
103
4
    signal pressAndHold()
4
    signal pressAndHold()
104
5
    property bool pressed
5
    property bool pressed
106
6
Ubuntu.Components.AbstractButton 1.3 UbuntuToolkit::UCAbstractButton: UbuntuToolkit.UCActionItem
6
Ubuntu.Components.AbstractButton 1.3 UbuntuToolkit::UCAbstractButton: ActionItem
107
7
    readonly property bool hovered
7
    readonly property bool hovered
108
8
    signal clicked()
8
    signal clicked()
109
9
    signal pressAndHold()
9
    signal pressAndHold()
110
10
    readonly property bool pressed
10
    readonly property bool pressed
112
11
    readonly property UbuntuToolkit.UCMargins sensingMargins
11
    readonly property UCMargins sensingMargins
113
12
Ubuntu.Components.Action 1.3 1.0 0.1 UbuntuToolkit::UCAction: QtObject
12
Ubuntu.Components.Action 1.3 1.0 0.1 UbuntuToolkit::UCAction: QtObject
114
13
    property string description
13
    property string description
115
14
    property bool enabled
14
    property bool enabled
116
@@ -24,8 +24,15 @@
117
24
    property var shortcut 1.3
24
    property var shortcut 1.3
118
25
    property string text
25
    property string text
119
26
    property bool visible
26
    property bool visible
122
27
Ubuntu.Components.ActionBar 1.3: UbuntuToolkit.UCStyledItemBase
27
Ubuntu.Components.Action.Type: Enum
123
28
    property list<UbuntuToolki>.UCAction> actions
28
    Bool
124
29
    Integer
125
30
    None
126
31
    Object
127
32
    Real
128
33
    String
129
34
Ubuntu.Components.ActionBar 1.3: StyledItem
130
35
    property list<Action> actions
131
29
    property Component delegate
36
    property Component delegate
132
30
    property int numberOfSlots
37
    property int numberOfSlots
133
31
Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
38
Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
134
@@ -35,12 +42,12 @@
135
35
    property url overflowIconSource
42
    property url overflowIconSource
136
36
    property string overflowText
43
    property string overflowText
137
37
Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject
44
Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject
139
38
    default property list<UbuntuToolki>.UCAction> actions
45
    default property list<Action> actions
140
39
    property bool active
46
    property bool active
145
40
    function addAction(UbuntuToolkit.UCAction action)
47
    function addAction(Action action)
146
41
    function removeAction(UbuntuToolkit.UCAction action)
48
    function removeAction(Action action)
147
42
Ubuntu.Components.ActionItem 1.0 0.1 UbuntuToolkit::UCActionItem: UbuntuToolkit.UCStyledItemBase
49
Ubuntu.Components.ActionItem 1.0 0.1 UbuntuToolkit::UCActionItem: StyledItem
148
43
    property UbuntuToolkit.UCAction action
50
    property Action action
149
44
    property string iconName
51
    property string iconName
150
45
    property url iconSource
52
    property url iconSource
151
46
    signal triggered(var value)
53
    signal triggered(var value)
152
@@ -48,20 +55,20 @@
153
48
    function trigger()
55
    function trigger()
154
49
    property string text
56
    property string text
155
50
Ubuntu.Components.ActionList 1.0 0.1: QtObject
57
Ubuntu.Components.ActionList 1.0 0.1: QtObject
158
51
    property list<UbuntuToolki>.UCAction> actions
58
    property list<Action> actions
159
52
    default property list<UbuntuToolki>.UCAction> children
59
    default property list<Action> children
160
53
Ubuntu.Components.ActionList 1.3: QtObject
60
Ubuntu.Components.ActionList 1.3: QtObject
163
54
    property list<UbuntuToolki>.UCAction> actions
61
    property list<Action> actions
164
55
    default property list<UbuntuToolki>.UCAction> children
62
    default property list<Action> children
165
56
Ubuntu.Components.ActionManager 1.0 0.1 UbuntuToolkit::UCActionManager: QtObject
63
Ubuntu.Components.ActionManager 1.0 0.1 UbuntuToolkit::UCActionManager: QtObject
169
57
    default property list<UbuntuToolki>.UCAction> actions
64
    default property list<Action> actions
170
58
    readonly property UbuntuToolkit.UCActionContext globalContext
65
    readonly property ActionContext globalContext
171
59
    property list<UbuntuToolki>.UCActionContext> localContexts
66
    property list<ActionContext> localContexts
172
60
    signal quit()
67
    signal quit()
177
61
    function addAction(UbuntuToolkit.UCAction action)
68
    function addAction(Action action)
178
62
    function removeAction(UbuntuToolkit.UCAction action)
69
    function removeAction(Action action)
179
63
    function addLocalContext(UbuntuToolkit.UCActionContext context)
70
    function addLocalContext(ActionContext context)
180
64
    function removeLocalContext(UbuntuToolkit.UCActionContext context)
71
    function removeLocalContext(ActionContext context)
181
65
Ubuntu.Components.Popups.ActionSelectionPopover 1.0 0.1: Popover
72
Ubuntu.Components.Popups.ActionSelectionPopover 1.0 0.1: Popover
182
66
    property var actions
73
    property var actions
183
67
    property Component delegate
74
    property Component delegate
184
@@ -76,10 +83,10 @@
185
76
Ubuntu.Components.ActivityIndicator 1.3: AnimatedItem
83
Ubuntu.Components.ActivityIndicator 1.3: AnimatedItem
186
77
    property bool onScreen
84
    property bool onScreen
187
78
    property bool running
85
    property bool running
189
79
Ubuntu.Components.AdaptivePageLayout 1.3: UbuntuToolkit.UCPageTreeNode
86
Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
190
80
    property bool asynchronous
87
    property bool asynchronous
191
81
    readonly property int columns
88
    readonly property int columns
193
82
    property list<PageColumnsLayou> layouts
89
    property list<PageColumnsLayout> layouts
194
83
    function var addPageToCurrentColumn(var sourcePage, var page, var properties)
90
    function var addPageToCurrentColumn(var sourcePage, var page, var properties)
195
84
    function var addPageToNextColumn(var sourcePage, var page, var properties)
91
    function var addPageToNextColumn(var sourcePage, var page, var properties)
196
85
    function var removePages(var page)
92
    function var removePages(var page)
197
@@ -98,10 +105,51 @@
198
98
    property url sound
105
    property url sound
199
99
    readonly property Status status
106
    readonly property Status status
200
100
    property AlarmType type
107
    property AlarmType type
201
108
Ubuntu.Components.Alarm.AlarmType: Enum
202
109
    OneTime
203
110
    Repeating
204
111
Ubuntu.Components.Alarm.DayOfWeek: Enum
205
112
    AutoDetect
206
113
    Daily
207
114
    Friday
208
115
    Monday
209
116
    Saturday
210
117
    Sunday
211
118
    Thursday
212
119
    Tuesday
213
120
    Wednesday
214
121
Ubuntu.Components.Alarm.DaysOfWeek: Flag
215
122
    AutoDetect
216
123
    Daily
217
124
    Friday
218
125
    Monday
219
126
    Saturday
220
127
    Sunday
221
128
    Thursday
222
129
    Tuesday
223
130
    Wednesday
224
131
Ubuntu.Components.Alarm.Error: Enum
225
132
    AdaptationError
226
133
    EarlyDate
227
134
    InvalidDate
228
135
    InvalidEvent
229
136
    NoDaysOfWeek
230
137
    NoError
231
138
    OneTimeOnMoreDays
232
139
    OperationPending
233
140
Ubuntu.Components.Alarm.Operation: Enum
234
141
    Canceling
235
142
    NoOperation
236
143
    Reseting
237
144
    Saving
238
145
Ubuntu.Components.Alarm.Status: Enum
239
146
    Fail
240
147
    InProgress
241
148
    Ready
242
101
Ubuntu.Components.AlarmModel 1.0 0.1 UbuntuToolkit::UCAlarmModel: QAbstractListModel
149
Ubuntu.Components.AlarmModel 1.0 0.1 UbuntuToolkit::UCAlarmModel: QAbstractListModel
243
102
    readonly property int count
150
    readonly property int count
244
103
    function refresh() 1.0
151
    function refresh() 1.0
246
104
    function UbuntuToolkit.UCAlarm* get(int index)
152
    function Alarm get(int index)
247
105
Ubuntu.Components.Argument 1.0 0.1 UbuntuToolkit::UCArgument: QtObject
153
Ubuntu.Components.Argument 1.0 0.1 UbuntuToolkit::UCArgument: QtObject
248
106
    property string help
154
    property string help
249
107
    function var at(int i)
155
    function var at(int i)
250
@@ -109,8 +157,8 @@
251
109
    property bool required
157
    property bool required
252
110
    property QStringList valueNames
158
    property QStringList valueNames
253
111
Ubuntu.Components.Arguments 1.0 0.1 UbuntuToolkit::UCArguments: QtObject
159
Ubuntu.Components.Arguments 1.0 0.1 UbuntuToolkit::UCArguments: QtObject
256
112
    default property list<UbuntuToolki>.UCArgument> arguments
160
    default property list<Argument> arguments
257
113
    property UbuntuToolkit.UCArgument defaultArgument
161
    property Argument defaultArgument
258
114
    readonly property bool error
162
    readonly property bool error
259
115
    readonly property string errorMessage
163
    readonly property string errorMessage
260
116
    function printUsage()
164
    function printUsage()
261
@@ -129,20 +177,20 @@
262
129
    property var icon
177
    property var icon
263
130
    property bool iconFrame
178
    property bool iconFrame
264
131
    property bool progression
179
    property bool progression
267
132
Ubuntu.Components.BottomEdge 1.3 UbuntuToolkit::UCBottomEdge: UbuntuToolkit.UCStyledItemBase
180
Ubuntu.Components.BottomEdge 1.3 UbuntuToolkit::UCBottomEdge: StyledItem
268
133
    readonly property UbuntuToolkit.UCBottomEdgeRegion activeRegion
181
    readonly property BottomEdgeRegion activeRegion
269
134
    property Component contentComponent
182
    property Component contentComponent
270
135
    readonly property Item contentItem
183
    readonly property Item contentItem
271
136
    property url contentUrl
184
    property url contentUrl
272
137
    readonly property DragDirection dragDirection
185
    readonly property DragDirection dragDirection
273
138
    readonly property double dragProgress
186
    readonly property double dragProgress
275
139
    readonly property UbuntuToolkit.UCBottomEdgeHint hint
187
    readonly property BottomEdgeHint hint
276
140
    signal dragProgressChanged(double dragProgress)
188
    signal dragProgressChanged(double dragProgress)
279
141
    signal dragDirectionChanged(UbuntuToolkit.UCBottomEdge direction)
189
    signal dragDirectionChanged(BottomEdge.DragDirection direction)
280
142
    signal statusChanged(UbuntuToolkit.UCBottomEdge status)
190
    signal statusChanged(BottomEdge.Status status)
281
143
    signal contentChanged(url url)
191
    signal contentChanged(url url)
282
144
    signal contentComponentChanged(Component component)
192
    signal contentComponentChanged(Component component)
284
145
    signal activeRegionChanged(UbuntuToolkit.UCBottomEdgeRegion activeRegion)
193
    signal activeRegionChanged(BottomEdgeRegion activeRegion)
285
146
    signal commitStarted()
194
    signal commitStarted()
286
147
    signal commitCompleted()
195
    signal commitCompleted()
287
148
    signal collapseStarted()
196
    signal collapseStarted()
288
@@ -150,14 +198,27 @@
289
150
    function commit()
198
    function commit()
290
151
    function collapse()
199
    function collapse()
291
152
    property bool preloadContent
200
    property bool preloadContent
293
153
    property list<UbuntuToolki>.UCBottomEdgeRegion> regions
201
    property list<BottomEdgeRegion> regions
294
154
    readonly property Status status
202
    readonly property Status status
296
155
Ubuntu.Components.BottomEdgeHint 1.3 UbuntuToolkit::UCBottomEdgeHint: UbuntuToolkit.UCActionItem
203
Ubuntu.Components.BottomEdge.DragDirection: Enum
297
204
    Downwards
298
205
    Undefined
299
206
    Upwards
300
207
Ubuntu.Components.BottomEdge.Status: Enum
301
208
    Committed
302
209
    Hidden
303
210
    Revealed
304
211
Ubuntu.Components.BottomEdgeHint 1.3 UbuntuToolkit::UCBottomEdgeHint: ActionItem
305
156
    property int deactivateTimeout
212
    property int deactivateTimeout
306
157
    property Flickable flickable
213
    property Flickable flickable
307
158
    signal clicked()
214
    signal clicked()
308
159
    property Status status
215
    property Status status
310
160
    readonly property UbuntuGestures.UCSwipeArea swipeArea
216
    readonly property SwipeArea swipeArea
311
217
Ubuntu.Components.BottomEdgeHint.Status: Enum
312
218
    Active
313
219
    Hidden
314
220
    Inactive
315
221
    Locked
316
161
Ubuntu.Components.BottomEdgeRegion 1.3 UbuntuToolkit::UCBottomEdgeRegion: QtObject
222
Ubuntu.Components.BottomEdgeRegion 1.3 UbuntuToolkit::UCBottomEdgeRegion: QtObject
317
162
    property Component contentComponent
223
    property Component contentComponent
318
163
    property url contentUrl
224
    property url contentUrl
319
@@ -185,7 +246,7 @@
320
185
    property Gradient gradient
246
    property Gradient gradient
321
186
    property string iconPosition
247
    property string iconPosition
322
187
    property color strokeColor
248
    property color strokeColor
324
188
Ubuntu.Components.Button 1.3: UbuntuToolkit.UCAbstractButton
249
Ubuntu.Components.Button 1.3: AbstractButton
325
189
    property color color
250
    property color color
326
190
    property QFont font
251
    property QFont font
327
191
    property Gradient gradient
252
    property Gradient gradient
328
@@ -201,17 +262,17 @@
329
201
    readonly property Label title
262
    readonly property Label title
330
202
Ubuntu.Components.Captions 1.3: ColumnLayout
263
Ubuntu.Components.Captions 1.3: ColumnLayout
331
203
    property int captionStyle
264
    property int captionStyle
334
204
    readonly property UbuntuToolkit.UCLabel subtitle
265
    readonly property Label subtitle
335
205
    readonly property UbuntuToolkit.UCLabel title
266
    readonly property Label title
336
206
Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton
267
Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton
337
207
    property bool checked
268
    property bool checked
339
208
Ubuntu.Components.CheckBox 1.3: UbuntuToolkit.UCAbstractButton
269
Ubuntu.Components.CheckBox 1.3: AbstractButton
340
209
    property bool checked
270
    property bool checked
341
210
Ubuntu.Components.Clipboard 1.0 0.1: QtObject singleton
271
Ubuntu.Components.Clipboard 1.0 0.1: QtObject singleton
343
211
    readonly property UbuntuToolkit.QQuickMimeData data
272
    readonly property MimeData data
344
212
    function push(var data)
273
    function push(var data)
345
213
    function clear()
274
    function clear()
347
214
    function UbuntuToolkit.QQuickMimeData* newData()
275
    function MimeData newData()
348
215
Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
276
Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
349
216
    function double luminance(color color)
277
    function double luminance(color color)
350
217
Ubuntu.Components.ComboButton 1.1: Button
278
Ubuntu.Components.ComboButton 1.1: Button
351
@@ -221,7 +282,7 @@
352
221
    property color dropdownColor
282
    property color dropdownColor
353
222
    property bool expanded
283
    property bool expanded
354
223
    property double expandedHeight
284
    property double expandedHeight
356
224
Ubuntu.Components.ComboButton 1.3: UbuntuToolkit.UCAbstractButton
285
Ubuntu.Components.ComboButton 1.3: AbstractButton
357
225
    property double collapsedHeight
286
    property double collapsedHeight
358
226
    property color color
287
    property color color
359
227
    default property list<QtObject> comboList
288
    default property list<QtObject> comboList
360
@@ -280,7 +341,7 @@
361
280
    property url source
341
    property url source
362
281
    property QSizeF sourceSize
342
    property QSizeF sourceSize
363
282
    readonly property int status
343
    readonly property int status
365
283
Ubuntu.Components.Pickers.DatePicker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
344
Ubuntu.Components.Pickers.DatePicker 1.0 0.1: StyledItem
366
284
    property QDateTime date
345
    property QDateTime date
367
285
    readonly property int day
346
    readonly property int day
368
286
    readonly property int hours
347
    readonly property int hours
369
@@ -294,7 +355,7 @@
370
294
    readonly property int seconds
355
    readonly property int seconds
371
295
    readonly property int week
356
    readonly property int week
372
296
    readonly property int year
357
    readonly property int year
374
297
Ubuntu.Components.Pickers.DatePicker 1.3: UbuntuToolkit.UCStyledItemBase
358
Ubuntu.Components.Pickers.DatePicker 1.3: StyledItem
375
298
    property QDateTime date
359
    property QDateTime date
376
299
    readonly property int day
360
    readonly property int day
377
300
    readonly property int hours
361
    readonly property int hours
378
@@ -317,31 +378,31 @@
379
317
    property bool doneButton
378
    property bool doneButton
380
318
    signal closeClicked()
379
    signal closeClicked()
381
319
    signal doneClicked()
380
    signal doneClicked()
401
320
Ubuntu.Components.Pickers.Dialer 1.0 0.1: UbuntuToolkit.UCStyledItemBase
381
Ubuntu.Components.Pickers.Dialer 1.0 0.1: StyledItem
402
321
    property list<QtObject> centerContent
382
    property list<QtObject> centerContent
403
322
    readonly property Item centerItem
383
    readonly property Item centerItem
404
323
    property double handSpace
384
    property double handSpace
405
324
    readonly property var hands
385
    readonly property var hands
406
325
    property double maximumValue
386
    property double maximumValue
407
326
    signal handUpdated(var hand)
387
    signal handUpdated(var hand)
408
327
    property double minimumValue
388
    property double minimumValue
409
328
    property double size
389
    property double size
410
329
Ubuntu.Components.Pickers.Dialer 1.3: UbuntuToolkit.UCStyledItemBase
390
Ubuntu.Components.Pickers.Dialer 1.3: StyledItem
411
330
    property list<QtObject> centerContent
391
    property list<QtObject> centerContent
412
331
    readonly property Item centerItem
392
    readonly property Item centerItem
413
332
    property double handSpace
393
    property double handSpace
414
333
    readonly property var hands
394
    readonly property var hands
415
334
    property double maximumValue
395
    property double maximumValue
416
335
    signal handUpdated(var hand)
396
    signal handUpdated(var hand)
417
336
    property double minimumValue
397
    property double minimumValue
418
337
    property double size
398
    property double size
419
338
Ubuntu.Components.Pickers.DialerHand 1.0 0.1: UbuntuToolkit.UCStyledItemBase
399
Ubuntu.Components.Pickers.DialerHand 1.0 0.1: StyledItem
420
339
    readonly property Dialer dialer
400
    readonly property Dialer dialer
421
340
    property DialerHandGroup hand
401
    property DialerHandGroup hand
422
341
    readonly property int index
402
    readonly property int index
423
342
    default property list<QtObject> overlay
403
    default property list<QtObject> overlay
424
343
    property double value
404
    property double value
426
344
Ubuntu.Components.Pickers.DialerHand 1.3: UbuntuToolkit.UCStyledItemBase
405
Ubuntu.Components.Pickers.DialerHand 1.3: StyledItem
427
345
    readonly property Dialer dialer
406
    readonly property Dialer dialer
428
346
    property DialerHandGroup hand
407
    property DialerHandGroup hand
429
347
    readonly property int index
408
    readonly property int index
430
@@ -367,7 +428,7 @@
431
367
    property Component style
428
    property Component style
432
368
    property string styleName
429
    property string styleName
433
369
    property string text
430
    property string text
435
370
    property UbuntuToolkit.UCTheme theme
431
    property ThemeSettings theme
436
371
    property string title
432
    property string title
437
372
Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
433
Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
438
373
Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
434
Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
439
@@ -383,7 +444,7 @@
440
383
    property bool showDivider
444
    property bool showDivider
441
384
    readonly property string swipingState
445
    readonly property string swipingState
442
385
    readonly property bool waitingConfirmationForRemoval
446
    readonly property bool waitingConfirmationForRemoval
444
386
Ubuntu.Components.ListItems.Empty 1.3: UbuntuToolkit.UCAbstractButton
447
Ubuntu.Components.ListItems.Empty 1.3: AbstractButton
445
387
    property list<Item> backgroundIndicator
448
    property list<Item> backgroundIndicator
446
388
    property bool confirmRemoval
449
    property bool confirmRemoval
447
389
    readonly property ThinDivider divider
450
    readonly property ThinDivider divider
448
@@ -441,7 +502,7 @@
449
441
    property bool useDeprecatedToolbar
502
    property bool useDeprecatedToolbar
450
442
Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
503
Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
451
443
    property string text
504
    property string text
453
444
Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: UbuntuToolkit.UCStyledItemBase
505
Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: StyledItem
454
445
    property bool automaticHeight
506
    property bool automaticHeight
455
446
    property bool exposed
507
    property bool exposed
456
447
    property Flickable flickable
508
    property Flickable flickable
457
@@ -458,7 +519,7 @@
458
458
    property color keyColor
519
    property color keyColor
459
459
    property string name
520
    property string name
460
460
    property url source
521
    property url source
462
461
Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: UbuntuToolkit.UCMouse
522
Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: Mouse
463
462
Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea
523
Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea
464
463
    function bool contains(QPointF point)
524
    function bool contains(QPointF point)
465
464
    property Item sensingArea
525
    property Item sensingArea
466
@@ -494,21 +555,28 @@
467
494
Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
555
Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
468
495
    property string fontSize
556
    property string fontSize
469
496
    property TextSize textSize
557
    property TextSize textSize
470
558
Ubuntu.Components.Label.TextSize: Enum
471
559
    Large
472
560
    Medium
473
561
    Small
474
562
    XLarge
475
563
    XSmall
476
564
    XxSmall
477
497
Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
565
Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
478
498
    readonly property string currentLayout
566
    readonly property string currentLayout
479
499
    property list<ConditionalLayout> layouts
567
    property list<ConditionalLayout> layouts
482
500
Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: UbuntuToolkit.UCStyledItemBase
568
Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: StyledItem
483
501
    property UbuntuToolkit.UCAction action
569
    property Action action
484
502
    property color color
570
    property color color
485
503
    readonly property Item contentItem
571
    readonly property Item contentItem
486
504
    readonly property bool contentMoving
572
    readonly property bool contentMoving
488
505
    readonly property UbuntuToolkit.UCListItemDivider divider
573
    readonly property UCListItemDivider divider
489
506
    property bool dragMode
574
    property bool dragMode
490
507
    readonly property bool dragging
575
    readonly property bool dragging
492
508
    readonly property UbuntuToolkit.UCListItemExpansion expansion 1.3
576
    readonly property UCListItemExpansion expansion 1.3
493
509
    property color highlightColor
577
    property color highlightColor
494
510
    readonly property bool highlighted
578
    readonly property bool highlighted
496
511
    property UbuntuToolkit.UCListItemActions leadingActions
579
    property ListItemActions leadingActions
497
512
    property list<Item> listItemChildren
580
    property list<Item> listItemChildren
498
513
    default property list<QtObject> listItemData
581
    default property list<QtObject> listItemData
499
514
    signal clicked()
582
    signal clicked()
500
@@ -519,9 +587,9 @@
501
519
    property bool selected
587
    property bool selected
502
520
    property bool swipeEnabled 1.3
588
    property bool swipeEnabled 1.3
503
521
    readonly property bool swiped 1.3
589
    readonly property bool swiped 1.3
505
522
    property UbuntuToolkit.UCListItemActions trailingActions
590
    property ListItemActions trailingActions
506
523
Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject
591
Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject
508
524
    property list<UbuntuToolki>.UCAction> actions
592
    property list<Action> actions
509
525
    default property list<QtObject> data
593
    default property list<QtObject> data
510
526
    property Component delegate
594
    property Component delegate
511
527
Ubuntu.Components.ListItemDrag 1.2: QtObject
595
Ubuntu.Components.ListItemDrag 1.2: QtObject
512
@@ -531,23 +599,33 @@
513
531
    property int minimumIndex
599
    property int minimumIndex
514
532
    readonly property Status status
600
    readonly property Status status
515
533
    readonly property int to
601
    readonly property int to
520
534
Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: UbuntuToolkit.UCSlotsLayout
602
Ubuntu.Components.ListItemDrag.Status: Enum
521
535
    readonly property UbuntuToolkit.UCLabel subtitle
603
    Dropped
522
536
    readonly property UbuntuToolkit.UCLabel summary
604
    Moving
523
537
    readonly property UbuntuToolkit.UCLabel title
605
    Started
524
606
Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: SlotsLayout
525
607
    readonly property Label subtitle
526
608
    readonly property Label summary
527
609
    readonly property Label title
528
538
Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item
610
Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item
529
539
    readonly property bool animatePanels
611
    readonly property bool animatePanels
530
540
    property Item dragPanel
612
    property Item dragPanel
531
541
    property PropertyAnimation dropAnimation
613
    property PropertyAnimation dropAnimation
532
542
    readonly property Flickable flickable 1.3
614
    readonly property Flickable flickable 1.3
533
543
    readonly property int listItemIndex 1.3
615
    readonly property int listItemIndex 1.3
535
544
    function swipeEvent(UCSwipeEvent event)
616
    function swipeEvent(SwipeEvent event)
536
545
    function rebound()
617
    function rebound()
537
546
    property Animation snapAnimation
618
    property Animation snapAnimation
538
547
Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject
619
Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject
539
548
    property Frequency frequency
620
    property Frequency frequency
540
549
    signal trigger()
621
    signal trigger()
541
550
    property QDateTime relativeTime
622
    property QDateTime relativeTime
542
623
Ubuntu.Components.LiveTimer.Frequency: Enum
543
624
    Disabled
544
625
    Hour
545
626
    Minute
546
627
    Relative
547
628
    Second
548
551
Ubuntu.Components.MainView 1.0 0.1: MainViewBase
629
Ubuntu.Components.MainView 1.0 0.1: MainViewBase
549
552
    property bool automaticOrientation
630
    property bool automaticOrientation
550
553
    default property list<QtObject> contentsItem
631
    default property list<QtObject> contentsItem
551
@@ -555,13 +633,13 @@
552
555
Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
633
Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
553
556
    property bool automaticOrientation
634
    property bool automaticOrientation
554
557
    default property list<QtObject> contentsItem
635
    default property list<QtObject> contentsItem
556
558
Ubuntu.Components.MainView 1.3: UbuntuToolkit.UCMainViewBase
636
Ubuntu.Components.MainView 1.3: MainViewBase
557
559
    property bool automaticOrientation
637
    property bool automaticOrientation
558
560
    default property list<QtObject> contentsItem
638
    default property list<QtObject> contentsItem
563
561
Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: UbuntuToolkit.UCPageTreeNode
639
Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: PageTreeNode
564
562
    readonly property UbuntuToolkit.UCPopupContext actionContext
640
    readonly property PopupContext actionContext
565
563
    readonly property UbuntuToolkit.UCActionManager actionManager
641
    readonly property ActionManager actionManager
566
564
    property list<UbuntuToolki>.UCAction> actions
642
    property list<Action> actions
567
565
    property bool anchorToKeyboard
643
    property bool anchorToKeyboard
568
566
    property string applicationName
644
    property string applicationName
569
567
    property color backgroundColor
645
    property color backgroundColor
570
@@ -572,8 +650,8 @@
571
572
    signal headerColorChanged(color headerColor)
650
    signal headerColorChanged(color headerColor)
572
573
    signal backgroundColorChanged(color backgroundColor)
651
    signal backgroundColorChanged(color backgroundColor)
573
574
    signal footerColorChanged(color footerColor)
652
    signal footerColorChanged(color footerColor)
576
575
    signal actionManagerChanged(UbuntuToolkit.UCActionManager actionManager)
653
    signal actionManagerChanged(ActionManager actionManager)
577
576
    signal actionContextChanged(UbuntuToolkit.UCPopupContext actionContext)
654
    signal actionContextChanged(PopupContext actionContext)
578
577
Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
655
Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
579
578
    function double clamp(double x, double min, double max)
656
    function double clamp(double x, double min, double max)
580
579
    function double lerp(double delta, double from, double to)
657
    function double lerp(double delta, double from, double to)
581
@@ -602,6 +680,9 @@
582
602
    signal entered(QQuickMouseEvent event, Item host)
680
    signal entered(QQuickMouseEvent event, Item host)
583
603
    signal exited(QQuickMouseEvent event, Item host)
681
    signal exited(QQuickMouseEvent event, Item host)
584
604
    property Priority priority
682
    property Priority priority
585
683
Ubuntu.Components.Mouse.Priority: Enum
586
684
    AfterItem
587
685
    BeforeItem
588
605
Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
686
Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
589
606
    property bool enabled
687
    property bool enabled
590
607
    signal enabledChanged(bool value)
688
    signal enabledChanged(bool value)
591
@@ -664,14 +745,14 @@
592
664
    readonly property bool rotating
745
    readonly property bool rotating
593
665
    property bool transitionEnabled
746
    property bool transitionEnabled
594
666
Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
747
Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
596
667
    property list<UbuntuToolki>.UCAction> actions
748
    property list<Action> actions
597
668
    property Flickable flickable
749
    property Flickable flickable
598
669
    property string title
750
    property string title
599
670
    property Item tools
751
    property Item tools
600
671
Ubuntu.Components.Page 1.1 Page11: Page10
752
Ubuntu.Components.Page 1.1 Page11: Page10
601
672
    readonly property PageHeadConfiguration head
753
    readonly property PageHeadConfiguration head
604
673
Ubuntu.Components.Page 1.3: UbuntuToolkit.UCPageTreeNode
754
Ubuntu.Components.Page 1.3: PageTreeNode
605
674
    readonly property UbuntuToolkit.UCActionContext actionContext
755
    readonly property ActionContext actionContext
606
675
    property Flickable flickable
756
    property Flickable flickable
607
676
    readonly property PageHeadConfiguration head
757
    readonly property PageHeadConfiguration head
608
677
    property Item header
758
    property Item header
609
@@ -682,18 +763,18 @@
610
682
    property double minimumWidth
763
    property double minimumWidth
611
683
    property double preferredWidth
764
    property double preferredWidth
612
684
Ubuntu.Components.PageColumnsLayout 1.3: QtObject
765
Ubuntu.Components.PageColumnsLayout 1.3: QtObject
614
685
    default property list<PageColum> data
766
    default property list<PageColumn> data
615
686
    property bool when
767
    property bool when
616
687
Ubuntu.Components.PageHeadConfiguration 1.1: Object
768
Ubuntu.Components.PageHeadConfiguration 1.1: Object
619
688
    property list<UbuntuToolki>.UCAction> actions
769
    property list<Action> actions
620
689
    property UbuntuToolkit.UCAction backAction
770
    property Action backAction
621
690
    property Item contents
771
    property Item contents
622
691
    property color foregroundColor
772
    property color foregroundColor
623
692
    property string preset
773
    property string preset
624
693
    readonly property PageHeadSections sections
774
    readonly property PageHeadSections sections
625
694
Ubuntu.Components.PageHeadConfiguration 1.3: Object
775
Ubuntu.Components.PageHeadConfiguration 1.3: Object
628
695
    property list<UbuntuToolki>.UCAction> actions
776
    property list<Action> actions
629
696
    property UbuntuToolkit.UCAction backAction
777
    property Action backAction
630
697
    property Item contents
778
    property Item contents
631
698
    property Flickable flickable
779
    property Flickable flickable
632
699
    property color foregroundColor
780
    property color foregroundColor
633
@@ -707,18 +788,18 @@
634
707
    property var model
788
    property var model
635
708
    property int selectedIndex
789
    property int selectedIndex
636
709
Ubuntu.Components.PageHeadSections 1.3: QtObject
790
Ubuntu.Components.PageHeadSections 1.3: QtObject
638
710
    property list<UbuntuToolki>.UCAction> actions
791
    property list<Action> actions
639
711
    property bool enabled
792
    property bool enabled
640
712
    property var model
793
    property var model
641
713
    property int selectedIndex
794
    property int selectedIndex
642
714
Ubuntu.Components.PageHeadState 1.1: State
795
Ubuntu.Components.PageHeadState 1.1: State
645
715
    property list<UbuntuToolki>.UCAction> actions
796
    property list<Action> actions
646
716
    property UbuntuToolkit.UCAction backAction
797
    property Action backAction
647
717
    property Item contents
798
    property Item contents
648
718
    property PageHeadConfiguration head
799
    property PageHeadConfiguration head
649
719
Ubuntu.Components.PageHeadState 1.3: State
800
Ubuntu.Components.PageHeadState 1.3: State
652
720
    property list<UbuntuToolki>.UCAction> actions
801
    property list<Action> actions
653
721
    property UbuntuToolkit.UCAction backAction
802
    property Action backAction
654
722
    property Item contents
803
    property Item contents
655
723
    property PageHeadConfiguration head
804
    property PageHeadConfiguration head
656
724
Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
805
Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
657
@@ -740,11 +821,11 @@
658
740
    property color textColor
821
    property color textColor
659
741
    property double textLeftMargin
822
    property double textLeftMargin
660
742
    property int textSize
823
    property int textSize
662
743
Ubuntu.Components.PageHeader 1.3: UbuntuToolkit.UCHeader
824
Ubuntu.Components.PageHeader 1.3: Header
663
744
    property Item contents
825
    property Item contents
664
745
    property Item extension
826
    property Item extension
665
746
    readonly property ActionBar leadingActionBar
827
    readonly property ActionBar leadingActionBar
667
747
    property list<UbuntuToolki>.UCAction> navigationActions
828
    property list<Action> navigationActions
668
748
    readonly property Sections sections
829
    readonly property Sections sections
669
749
    property string subtitle
830
    property string subtitle
670
750
    property string title
831
    property string title
671
@@ -765,19 +846,19 @@
672
765
    function var push(var page, var properties)
846
    function var push(var page, var properties)
673
766
    function var pop()
847
    function var pop()
674
767
    function var clear()
848
    function var clear()
676
768
Ubuntu.Components.PageStack 1.3: UbuntuToolkit.UCPageTreeNode
849
Ubuntu.Components.PageStack 1.3: PageTreeNode
677
769
    property Item currentPage
850
    property Item currentPage
678
770
    property int depth
851
    property int depth
679
771
    function var push(var page, var properties)
852
    function var push(var page, var properties)
680
772
    function var pop()
853
    function var pop()
681
773
    function var clear()
854
    function var clear()
683
774
Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: UbuntuToolkit.UCStyledItemBase
855
Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: StyledItem
684
775
    property bool active
856
    property bool active
685
776
    readonly property Item activeLeafNode
857
    readonly property Item activeLeafNode
686
777
    property bool isLeaf
858
    property bool isLeaf
687
778
    signal isLeafChanged(bool isLeaf)
859
    signal isLeafChanged(bool isLeaf)
688
779
    signal activeChanged(bool active)
860
    signal activeChanged(bool active)
690
780
    signal parentNodeChanged(UbuntuToolkit.UCPageTreeNode parentNode)
861
    signal parentNodeChanged(PageTreeNode parentNode)
691
781
    signal pageStackChanged(Item pageStack)
862
    signal pageStackChanged(Item pageStack)
692
782
    signal activeLeafNodeChanged(Item activeLeafNode)
863
    signal activeLeafNodeChanged(Item activeLeafNode)
693
783
    signal propagatedChanged(QtObject propagated)
864
    signal propagatedChanged(QtObject propagated)
694
@@ -785,7 +866,7 @@
695
785
    signal isPageTreeNodeChanged(bool isPageTreeNode)
866
    signal isPageTreeNodeChanged(bool isPageTreeNode)
696
786
    function dumpNodeTree()
867
    function dumpNodeTree()
697
787
    property Item pageStack
868
    property Item pageStack
699
788
    property UbuntuToolkit.UCPageTreeNode parentNode
869
    property PageTreeNode parentNode
700
789
    property Item toolbar
870
    property Item toolbar
701
790
Ubuntu.Components.Themes.Palette 0.1: QtObject
871
Ubuntu.Components.Themes.Palette 0.1: QtObject
702
791
    property PaletteValues normal
872
    property PaletteValues normal
703
@@ -868,7 +949,7 @@
704
868
    property double triggerSize
949
    property double triggerSize
705
869
Ubuntu.PerformanceMetrics.PerformanceOverlay 1.0 0.1: Item
950
Ubuntu.PerformanceMetrics.PerformanceOverlay 1.0 0.1: Item
706
870
    property bool active
951
    property bool active
708
871
Ubuntu.Components.Pickers.Picker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
952
Ubuntu.Components.Pickers.Picker 1.0 0.1: StyledItem
709
872
    property bool circular
953
    property bool circular
710
873
    property Component delegate
954
    property Component delegate
711
874
    property bool live
955
    property bool live
712
@@ -876,7 +957,7 @@
713
876
    property var model
957
    property var model
714
877
    readonly property bool moving
958
    readonly property bool moving
715
878
    property int selectedIndex
959
    property int selectedIndex
717
879
Ubuntu.Components.Pickers.Picker 1.3: UbuntuToolkit.UCStyledItemBase
960
Ubuntu.Components.Pickers.Picker 1.3: StyledItem
718
880
    property bool circular
961
    property bool circular
719
881
    property Component delegate
962
    property Component delegate
720
882
    property double itemHeight
963
    property double itemHeight
721
@@ -887,7 +968,7 @@
722
887
    property int selectedIndex
968
    property int selectedIndex
723
888
Ubuntu.Components.Pickers.PickerDelegate 1.0 0.1: AbstractButton
969
Ubuntu.Components.Pickers.PickerDelegate 1.0 0.1: AbstractButton
724
889
    readonly property Picker picker
970
    readonly property Picker picker
726
890
Ubuntu.Components.Pickers.PickerDelegate 1.3: UbuntuToolkit.UCAbstractButton
971
Ubuntu.Components.Pickers.PickerDelegate 1.3: AbstractButton
727
891
    readonly property Picker picker
972
    readonly property Picker picker
728
892
Ubuntu.Components.Pickers.PickerPanel 1.0 0.1: Object singleton
973
Ubuntu.Components.Pickers.PickerPanel 1.0 0.1: Object singleton
729
893
    function var openDatePicker(var caller, var property, var mode)
974
    function var openDatePicker(var caller, var property, var mode)
730
@@ -919,7 +1000,7 @@
731
919
    property Item pointerTarget
1000
    property Item pointerTarget
732
920
    property Component style
1001
    property Component style
733
921
    property string styleName
1002
    property string styleName
735
922
    property UbuntuToolkit.UCTheme theme
1003
    property ThemeSettings theme
736
923
Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
1004
Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
737
924
    property Item dismissArea
1005
    property Item dismissArea
738
925
    property PropertyAnimation fadingAnimation
1006
    property PropertyAnimation fadingAnimation
739
@@ -932,7 +1013,7 @@
740
932
    property bool grabDismissAreaEvents
1013
    property bool grabDismissAreaEvents
741
933
    function var show()
1014
    function var show()
742
934
    function var hide()
1015
    function var hide()
744
935
Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: UbuntuToolkit.UCActionContext
1016
Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: ActionContext
745
936
Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
1017
Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
746
937
Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
1018
Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
747
938
    property bool indeterminate
1019
    property bool indeterminate
748
@@ -955,15 +1036,15 @@
749
955
    property color keyColor
1036
    property color keyColor
750
956
    property string name
1037
    property string name
751
957
    property url source
1038
    property url source
754
958
Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuToolkit.UCUbuntuShape
1039
Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuShape
755
959
Ubuntu.Components.PullToRefresh 1.1: UbuntuToolkit.UCStyledItemBase
1040
Ubuntu.Components.PullToRefresh 1.1: StyledItem
756
960
    property Component content
1041
    property Component content
757
961
    signal refresh()
1042
    signal refresh()
758
962
    readonly property double offset
1043
    readonly property double offset
759
963
    property bool refreshing
1044
    property bool refreshing
760
964
    readonly property bool releaseToRefresh
1045
    readonly property bool releaseToRefresh
761
965
    property Flickable target
1046
    property Flickable target
763
966
Ubuntu.Components.PullToRefresh 1.3: UbuntuToolkit.UCStyledItemBase
1047
Ubuntu.Components.PullToRefresh 1.3: StyledItem
764
967
    property Component content
1048
    property Component content
765
968
    signal refresh()
1049
    signal refresh()
766
969
    readonly property double offset
1050
    readonly property double offset
767
@@ -974,27 +1055,26 @@
768
974
    property double activationThreshold
1055
    property double activationThreshold
769
975
    property Component defaultContent
1056
    property Component defaultContent
770
976
    property bool releaseToRefresh
1057
    property bool releaseToRefresh
771
977
Ubuntu.Components.QQuickImageBase 1.0 0.1 UbuntuToolkit::UCQQuickImageExtension: QQuickImageBase
772
978
Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
1058
Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
773
979
    readonly property UPMGraphModel graphModel
1059
    readonly property UPMGraphModel graphModel
774
980
    signal frameRendered(qlonglong renderTime)
1060
    signal frameRendered(qlonglong renderTime)
775
981
    property int period
1061
    property int period
776
982
    property int samples
1062
    property int samples
777
983
    property RenderTimer.TimerType timerType
1063
    property RenderTimer.TimerType timerType
779
984
Ubuntu.Components.ScrollView 1.3: UbuntuToolkit.UCStyledItemBase
1064
Ubuntu.Components.ScrollView 1.3: StyledItem
780
985
    default property Item contentItem
1065
    default property Item contentItem
781
986
    readonly property Flickable flickableItem
1066
    readonly property Flickable flickableItem
782
987
    property Scrollbar horizontalScrollbar
1067
    property Scrollbar horizontalScrollbar
783
988
    property Scrollbar verticalScrollbar
1068
    property Scrollbar verticalScrollbar
784
989
    readonly property Item viewport
1069
    readonly property Item viewport
793
990
Ubuntu.Components.Scrollbar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
1070
Ubuntu.Components.Scrollbar 1.0 0.1: StyledItem
794
991
    property int align
1071
    property int align
795
992
    property Flickable flickableItem
1072
    property Flickable flickableItem
796
993
Ubuntu.Components.Scrollbar 1.3: UbuntuToolkit.UCStyledItemBase
1073
Ubuntu.Components.Scrollbar 1.3: StyledItem
797
994
    property int align
1074
    property int align
798
995
    property Flickable flickableItem
1075
    property Flickable flickableItem
799
996
Ubuntu.Components.Sections 1.3: UbuntuToolkit.UCStyledItemBase
1076
Ubuntu.Components.Sections 1.3: StyledItem
800
997
    property list<UbuntuToolki>.UCAction> actions
1077
    property list<Action> actions
801
998
    property var model
1078
    property var model
802
999
    property int selectedIndex
1079
    property int selectedIndex
803
1000
Ubuntu.Components.Styles.SectionsStyle 1.3: Item
1080
Ubuntu.Components.Styles.SectionsStyle 1.3: Item
804
@@ -1011,6 +1091,15 @@
805
1011
    property string serviceInterface 1.1
1091
    property string serviceInterface 1.1
806
1012
    readonly property Status status 1.1
1092
    readonly property Status status 1.1
807
1013
    property ServiceType type 1.1
1093
    property ServiceType type 1.1
808
1094
Ubuntu.Components.ServiceProperties.ServiceType: Enum
809
1095
    Session
810
1096
    System
811
1097
    Undefined
812
1098
Ubuntu.Components.ServiceProperties.Status: Enum
813
1099
    Active
814
1100
    ConnectionError
815
1101
    Inactive
816
1102
    Synchronizing
817
1014
Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
1103
Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
818
1015
    default property list<QtObject> container
1104
    default property list<QtObject> container
819
1016
    property double contentsHeight
1105
    property double contentsHeight
820
@@ -1031,7 +1120,7 @@
821
1031
    property string value
1120
    property string value
822
1032
Ubuntu.Components.ListItems.SingleValue 1.3: Base
1121
Ubuntu.Components.ListItems.SingleValue 1.3: Base
823
1033
    property string value
1122
    property string value
825
1034
Ubuntu.Components.Slider 1.0 0.1: UbuntuToolkit.UCStyledItemBase
1123
Ubuntu.Components.Slider 1.0 0.1: StyledItem
826
1035
    property bool live
1124
    property bool live
827
1036
    property double maximumValue
1125
    property double maximumValue
828
1037
    signal touched(bool onThumb)
1126
    signal touched(bool onThumb)
829
@@ -1039,7 +1128,7 @@
830
1039
    property double minimumValue
1128
    property double minimumValue
831
1040
    readonly property bool pressed
1129
    readonly property bool pressed
832
1041
    property double value
1130
    property double value
834
1042
Ubuntu.Components.Slider 1.3: UbuntuToolkit.UCStyledItemBase
1131
Ubuntu.Components.Slider 1.3: StyledItem
835
1043
    property bool live
1132
    property bool live
836
1044
    property double maximumValue
1133
    property double maximumValue
837
1045
    signal touched(bool onThumb)
1134
    signal touched(bool onThumb)
838
@@ -1051,11 +1140,16 @@
839
1051
Ubuntu.Components.SliderUtils 0.1 1.0
1140
Ubuntu.Components.SliderUtils 0.1 1.0
840
1052
Ubuntu.Components.SlotsAttached 1.3: QtObject
1141
Ubuntu.Components.SlotsAttached 1.3: QtObject
841
1053
    property bool overrideVerticalPositioning
1142
    property bool overrideVerticalPositioning
844
1054
    readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
1143
    readonly property SlotsLayoutPadding padding
845
1055
    property UbuntuToolkit.UCSlotsLayout position
1144
    property SlotsLayout.UCSlotPosition position
846
1056
Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item
1145
Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item
847
1057
    property Item mainSlot
1146
    property Item mainSlot
849
1058
    readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
1147
    readonly property SlotsLayoutPadding padding
850
1148
Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
851
1149
    First
852
1150
    Last
853
1151
    Leading
854
1152
    Trailing
855
1059
Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
1153
Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
856
1060
    property double bottom
1154
    property double bottom
857
1061
    property double leading
1155
    property double leading
858
@@ -1066,11 +1160,11 @@
859
1066
    property string property
1160
    property string property
860
1067
Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel
1161
Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel
861
1068
    readonly property int count
1162
    readonly property int count
863
1069
    readonly property UbuntuToolkit.FilterBehavior filter
1163
    readonly property FilterBehavior filter
864
1070
    function QVariantMap get(int row)
1164
    function QVariantMap get(int row)
865
1071
    function int count()
1165
    function int count()
866
1072
    property QAbstractItemModel model
1166
    property QAbstractItemModel model
868
1073
    readonly property UbuntuToolkit.SortBehavior sort
1167
    readonly property SortBehavior sort
869
1074
Ubuntu.Components.ListItems.Standard 1.0 0.1: Empty
1168
Ubuntu.Components.ListItems.Standard 1.0 0.1: Empty
870
1075
    property Item control
1169
    property Item control
871
1076
    property string fallbackIconName
1170
    property string fallbackIconName
872
@@ -1096,7 +1190,7 @@
873
1096
    function bool requestFocus() 1.3
1190
    function bool requestFocus() 1.3
874
1097
    property Component style
1191
    property Component style
875
1098
    property string styleName 1.3
1192
    property string styleName 1.3
877
1099
    property UbuntuToolkit.UCTheme theme 1.3
1193
    property ThemeSettings theme 1.3
878
1100
Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
1194
Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
879
1101
    property string subText
1195
    property string subText
880
1102
Ubuntu.Components.ListItems.Subtitled 1.3: Base
1196
Ubuntu.Components.ListItems.Subtitled 1.3: Base
881
@@ -1116,26 +1210,37 @@
882
1116
    signal grabGestureChanged(bool grabGesture)
1210
    signal grabGestureChanged(bool grabGesture)
883
1117
    readonly property bool pressed
1211
    readonly property bool pressed
884
1118
    readonly property QPointF touchPosition
1212
    readonly property QPointF touchPosition
885
1213
Ubuntu.Components.SwipeArea.Direction: Enum
886
1214
    Downwards
887
1215
    Horizontal
888
1216
    Leftwards
889
1217
    Rightwards
890
1218
    Upwards
891
1219
    Vertical
892
1119
Ubuntu.Components.SwipeEvent 1.2: QtObject
1220
Ubuntu.Components.SwipeEvent 1.2: QtObject
893
1120
    property QPointF content
1221
    property QPointF content
894
1121
    readonly property QPointF from
1222
    readonly property QPointF from
895
1122
    readonly property Status status
1223
    readonly property Status status
896
1123
    readonly property QPointF to
1224
    readonly property QPointF to
897
1225
Ubuntu.Components.SwipeEvent.Status: Enum
898
1226
    Finished
899
1227
    Started
900
1228
    Updated
901
1124
Ubuntu.Components.Switch 1.0 0.1: AbstractButton
1229
Ubuntu.Components.Switch 1.0 0.1: AbstractButton
902
1125
    property bool checked
1230
    property bool checked
904
1126
Ubuntu.Components.Switch 1.3: UbuntuToolkit.UCAbstractButton
1231
Ubuntu.Components.Switch 1.3: AbstractButton
905
1127
    property bool checked
1232
    property bool checked
906
1128
Ubuntu.Components.Tab 1.0 0.1: PageTreeNode
1233
Ubuntu.Components.Tab 1.0 0.1: PageTreeNode
907
1129
    property url iconSource
1234
    property url iconSource
908
1130
    readonly property int index
1235
    readonly property int index
909
1131
    property Item page
1236
    property Item page
910
1132
    property string title
1237
    property string title
912
1133
Ubuntu.Components.Tab 1.3: UbuntuToolkit.UCPageTreeNode
1238
Ubuntu.Components.Tab 1.3: PageTreeNode
913
1134
    property url iconSource
1239
    property url iconSource
914
1135
    readonly property int index
1240
    readonly property int index
915
1136
    property Item page
1241
    property Item page
916
1137
    property string title
1242
    property string title
918
1138
Ubuntu.Components.TabBar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
1243
Ubuntu.Components.TabBar 1.0 0.1: StyledItem
919
1139
    property bool alwaysSelectionMode
1244
    property bool alwaysSelectionMode
920
1140
    property bool animate
1245
    property bool animate
921
1141
    property var model
1246
    property var model
922
@@ -1143,7 +1248,7 @@
923
1143
    property int selectedIndex
1248
    property int selectedIndex
924
1144
    property bool selectionMode
1249
    property bool selectionMode
925
1145
    property Item tabsItem
1250
    property Item tabsItem
927
1146
Ubuntu.Components.TabBar 1.3: UbuntuToolkit.UCStyledItemBase
1251
Ubuntu.Components.TabBar 1.3: StyledItem
928
1147
    property bool alwaysSelectionMode
1252
    property bool alwaysSelectionMode
929
1148
    property bool animate
1253
    property bool animate
930
1149
    property var model
1254
    property var model
931
@@ -1158,7 +1263,7 @@
932
1158
    property int selectedTabIndex
1263
    property int selectedTabIndex
933
1159
    property TabBar tabBar
1264
    property TabBar tabBar
934
1160
    default property list<QtObject> tabChildren
1265
    default property list<QtObject> tabChildren
936
1161
Ubuntu.Components.Tabs 1.3: UbuntuToolkit.UCPageTreeNode
1266
Ubuntu.Components.Tabs 1.3: PageTreeNode
937
1162
    readonly property int count
1267
    readonly property int count
938
1163
    readonly property Item currentPage
1268
    readonly property Item currentPage
939
1164
    readonly property Tab selectedTab
1269
    readonly property Tab selectedTab
940
@@ -1184,7 +1289,7 @@
941
1184
    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
1289
    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
942
1185
    function removeTimeConstraintsFromSwipeArea(Item item)
1290
    function removeTimeConstraintsFromSwipeArea(Item item)
943
1186
    readonly property bool touchPresent
1291
    readonly property bool touchPresent
945
1187
Ubuntu.Components.TextArea 1.0 0.1: UbuntuToolkit.UCStyledItemBase
1292
Ubuntu.Components.TextArea 1.0 0.1: StyledItem
946
1188
    property bool autoExpand
1293
    property bool autoExpand
947
1189
    property bool autoSize
1294
    property bool autoSize
948
1190
    property url baseUrl
1295
    property url baseUrl
949
@@ -1242,7 +1347,7 @@
950
1242
    property int textFormat
1347
    property int textFormat
951
1243
    property int verticalAlignment
1348
    property int verticalAlignment
952
1244
    property int wrapMode
1349
    property int wrapMode
954
1245
Ubuntu.Components.TextArea 1.3: UbuntuToolkit.UCStyledItemBase
1350
Ubuntu.Components.TextArea 1.3: StyledItem
955
1246
    property bool autoExpand
1351
    property bool autoExpand
956
1247
    property bool autoSize
1352
    property bool autoSize
957
1248
    property url baseUrl
1353
    property url baseUrl
958
@@ -1303,7 +1408,7 @@
959
1303
    property int textFormat
1408
    property int textFormat
960
1304
    property int verticalAlignment
1409
    property int verticalAlignment
961
1305
    property int wrapMode
1410
    property int wrapMode
963
1306
Ubuntu.Components.TextField 1.0 0.1: UbuntuToolkit.UCActionItem
1411
Ubuntu.Components.TextField 1.0 0.1: ActionItem
964
1307
    readonly property bool acceptableInput
1412
    readonly property bool acceptableInput
965
1308
    property bool autoScroll
1413
    property bool autoScroll
966
1309
    readonly property bool canPaste
1414
    readonly property bool canPaste
967
@@ -1364,7 +1469,7 @@
968
1364
    readonly property int selectionStart
1469
    readonly property int selectionStart
969
1365
    property QValidator validator
1470
    property QValidator validator
970
1366
    property int verticalAlignment
1471
    property int verticalAlignment
972
1367
Ubuntu.Components.TextField 1.3: UbuntuToolkit.UCActionItem
1472
Ubuntu.Components.TextField 1.3: ActionItem
973
1368
    readonly property bool acceptableInput
1473
    readonly property bool acceptableInput
974
1369
    property bool autoScroll
1474
    property bool autoScroll
975
1370
    readonly property bool canPaste
1475
    readonly property bool canPaste
976
@@ -1430,24 +1535,24 @@
977
1430
Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject
1535
Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject
978
1431
    property string name
1536
    property string name
979
1432
    property QtObject palette
1537
    property QtObject palette
981
1433
    readonly property UbuntuToolkit.UCTheme parentTheme
1538
    readonly property ThemeSettings parentTheme
982
1434
Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
1539
Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
983
1435
Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
1540
Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
984
1436
Ubuntu.Components.Toolbar 0.1: Panel
1541
Ubuntu.Components.Toolbar 0.1: Panel
985
1437
    property Item tools
1542
    property Item tools
987
1438
Ubuntu.Components.Toolbar 1.3: UbuntuToolkit.UCStyledItemBase
1543
Ubuntu.Components.Toolbar 1.3: StyledItem
988
1439
    readonly property ActionBar leadingActionBar
1544
    readonly property ActionBar leadingActionBar
989
1440
    readonly property ActionBar trailingActionBar
1545
    readonly property ActionBar trailingActionBar
992
1441
Ubuntu.Components.ToolbarButton 1.0 0.1: UbuntuToolkit.UCStyledItemBase
1546
Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
993
1442
    property UbuntuToolkit.UCAction action
1547
    property Action action
994
1443
    property string iconName
1548
    property string iconName
995
1444
    property url iconSource
1549
    property url iconSource
996
1445
    signal triggered(var value)
1550
    signal triggered(var value)
997
1446
    function trigger(var value)
1551
    function trigger(var value)
998
1447
    function trigger()
1552
    function trigger()
999
1448
    property string text
1553
    property string text
1002
1449
Ubuntu.Components.ToolbarButton 1.3: UbuntuToolkit.UCStyledItemBase
1554
Ubuntu.Components.ToolbarButton 1.3: StyledItem
1003
1450
    property UbuntuToolkit.UCAction action
1555
    property Action action
1004
1451
    property string iconName
1556
    property string iconName
1005
1452
    property url iconSource
1557
    property url iconSource
1006
1453
    signal triggered(var value)
1558
    signal triggered(var value)
1007
@@ -1468,12 +1573,28 @@
1008
1468
    property Item pageStack
1573
    property Item pageStack
1009
1469
Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
1574
Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
1010
1470
    property Component defaultDelegate
1575
    property Component defaultDelegate
1011
1576
UCActionContextAttached: QtObject
1012
1471
Ubuntu.Components.UCApplication 1.0 0.1: QtObject
1577
Ubuntu.Components.UCApplication 1.0 0.1: QtObject
1013
1472
    property string applicationName
1578
    property string applicationName
1014
1473
    property QtObject inputMethod
1579
    property QtObject inputMethod
1015
1474
Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
1580
Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
1016
1475
    function double sizeToPixels(string size)
1581
    function double sizeToPixels(string size)
1017
1476
    function double modularScale(string size)
1582
    function double modularScale(string size)
1018
1583
UCListItemDivider: Item
1019
1584
    property color colorFrom
1020
1585
    property color colorTo
1021
1586
UCListItemExpansion: QtObject
1022
1587
    property bool expanded
1023
1588
    property double height
1024
1589
UCMargins: QtObject
1025
1590
    property double all
1026
1591
    property double bottom
1027
1592
    property double left
1028
1593
    property double right
1029
1594
    property double top
1030
1595
UCStateSaverAttached: QtObject
1031
1596
    property bool enabled
1032
1597
    property string properties
1033
1477
Ubuntu.Components.UCUnits 1.0 0.1: QtObject
1598
Ubuntu.Components.UCUnits 1.0 0.1: QtObject
1034
1478
    property float gridUnit
1599
    property float gridUnit
1035
1479
    function float dp(float value)
1600
    function float dp(float value)
1036
@@ -1486,11 +1607,14 @@
1037
1486
    property int samples
1607
    property int samples
1038
1487
    readonly property int shift
1608
    readonly property int shift
1039
1488
Ubuntu.Components.Ubuntu 1.2: QtObject singleton
1609
Ubuntu.Components.Ubuntu 1.2: QtObject singleton
1041
1489
Ubuntu.Components.Ubuntu 1.3: UbuntuToolkit.UCNamespace singleton
1610
Ubuntu.Components.Ubuntu 1.3: Ubuntu singleton
1042
1490
    function ushort version(uchar major, uchar minor)
1611
    function ushort version(uchar major, uchar minor)
1043
1491
    readonly property ushort toolkitVersion
1612
    readonly property ushort toolkitVersion
1044
1492
    readonly property ushort toolkitVersionMajor
1613
    readonly property ushort toolkitVersionMajor
1045
1493
    readonly property ushort toolkitVersionMinor
1614
    readonly property ushort toolkitVersionMinor
1046
1615
Ubuntu.Components.Ubuntu.CaptionsStyle: Enum
1047
1616
    SummaryCaptionStyle
1048
1617
    TitleCaptionStyle
1049
1494
Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton
1618
Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton
1050
1495
    readonly property int BriskDuration
1619
    readonly property int BriskDuration
1051
1496
    readonly property int FastDuration
1620
    readonly property int FastDuration
1052
@@ -1545,13 +1669,6 @@
1053
1545
    readonly property color silk
1669
    readonly property color silk
1054
1546
    readonly property color slate
1670
    readonly property color slate
1055
1547
    readonly property color warmGrey
1671
    readonly property color warmGrey
1056
1548
Ubuntu.Components.UbuntuGestures.UCSwipeArea: Enum
1057
1549
    Downwards
1058
1550
    Horizontal
1059
1551
    Leftwards
1060
1552
    Rightwards
1061
1553
    Upwards
1062
1554
    Vertical
1063
1555
Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
1672
Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
1064
1556
    property int expandedIndex
1673
    property int expandedIndex
1065
1557
Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
1674
Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
1066
@@ -1584,7 +1701,30 @@
1067
1584
    property WrapMode sourceVerticalWrapMode 1.3
1701
    property WrapMode sourceVerticalWrapMode 1.3
1068
1585
    property bool stretched
1702
    property bool stretched
1069
1586
    property VAlignment verticalAlignment
1703
    property VAlignment verticalAlignment
1071
1587
Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuToolkit.UCUbuntuShape
1704
Ubuntu.Components.UbuntuShape.Aspect: Enum
1072
1705
    DropShadow
1073
1706
    Flat
1074
1707
    Inset
1075
1708
Ubuntu.Components.UbuntuShape.BackgroundMode: Enum
1076
1709
    SolidColor
1077
1710
    VerticalGradient
1078
1711
Ubuntu.Components.UbuntuShape.FillMode: Enum
1079
1712
    Pad
1080
1713
    PreserveAspectCrop
1081
1714
    PreserveAspectFit
1082
1715
    Stretch
1083
1716
Ubuntu.Components.UbuntuShape.HAlignment: Enum
1084
1717
    AlignHCenter
1085
1718
    AlignLeft
1086
1719
    AlignRight
1087
1720
Ubuntu.Components.UbuntuShape.VAlignment: Enum
1088
1721
    AlignBottom
1089
1722
    AlignTop
1090
1723
    AlignVCenter
1091
1724
Ubuntu.Components.UbuntuShape.WrapMode: Enum
1092
1725
    Repeat
1093
1726
    Transparent
1094
1727
Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuShape
1095
1588
    property color overlayColor
1728
    property color overlayColor
1096
1589
    property QRectF overlayRect
1729
    property QRectF overlayRect
1097
1590
Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
1730
Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
1098
@@ -1613,151 +1753,6 @@
1099
1613
    function var warningFormat(var line, var column, var message)
1753
    function var warningFormat(var line, var column, var message)
1100
1614
    function var waitForHeaderAnimation(var mainView)
1754
    function var waitForHeaderAnimation(var mainView)
1101
1615
    readonly property QuickTestUtil testUtil
1755
    readonly property QuickTestUtil testUtil
1102
1616
Ubuntu.Components.UbuntuToolkit.LiveTimer: Enum
1103
1617
    Disabled
1104
1618
    Hour
1105
1619
    Minute
1106
1620
    Relative
1107
1621
    Second
1108
1622
Ubuntu.Components.UbuntuToolkit.UCAction: Enum
1109
1623
    Bool
1110
1624
    Integer
1111
1625
    None
1112
1626
    Object
1113
1627
    Real
1114
1628
    String
1115
1629
UbuntuToolkit.UCActionContextAttached: QtObject
1116
1630
Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1117
1631
    Fail
1118
1632
    InProgress
1119
1633
    Ready
1120
1634
Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1121
1635
    Canceling
1122
1636
    NoOperation
1123
1637
    Reseting
1124
1638
    Saving
1125
1639
Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1126
1640
    AdaptationError
1127
1641
    EarlyDate
1128
1642
    InvalidDate
1129
1643
    InvalidEvent
1130
1644
    NoDaysOfWeek
1131
1645
    NoError
1132
1646
    OneTimeOnMoreDays
1133
1647
    OperationPending
1134
1648
Ubuntu.Components.UbuntuToolkit.UCAlarm: Flag
1135
1649
    AutoDetect
1136
1650
    Daily
1137
1651
    Friday
1138
1652
    Monday
1139
1653
    Saturday
1140
1654
    Sunday
1141
1655
    Thursday
1142
1656
    Tuesday
1143
1657
    Wednesday
1144
1658
Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1145
1659
    AutoDetect
1146
1660
    Daily
1147
1661
    Friday
1148
1662
    Monday
1149
1663
    Saturday
1150
1664
    Sunday
1151
1665
    Thursday
1152
1666
    Tuesday
1153
1667
    Wednesday
1154
1668
Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1155
1669
    OneTime
1156
1670
    Repeating
1157
1671
Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1158
1672
    Committed
1159
1673
    Hidden
1160
1674
    Revealed
1161
1675
Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1162
1676
    Downwards
1163
1677
    Undefined
1164
1678
    Upwards
1165
1679
Ubuntu.Components.UbuntuToolkit.UCBottomEdgeHint: Enum
1166
1680
    Active
1167
1681
    Hidden
1168
1682
    Inactive
1169
1683
    Locked
1170
1684
Ubuntu.Components.UbuntuToolkit.UCDragEvent: Enum
1171
1685
    Dropped
1172
1686
    Moving
1173
1687
    Started
1174
1688
Ubuntu.Components.UbuntuToolkit.UCLabel: Enum
1175
1689
    Large
1176
1690
    Medium
1177
1691
    Small
1178
1692
    XLarge
1179
1693
    XSmall
1180
1694
    XxSmall
1181
1695
UbuntuToolkit.UCListItemDivider: Item
1182
1696
    property color colorFrom
1183
1697
    property color colorTo
1184
1698
UbuntuToolkit.UCListItemExpansion: QtObject
1185
1699
    property bool expanded
1186
1700
    property double height
1187
1701
UbuntuToolkit.UCMargins: QtObject
1188
1702
    property double all
1189
1703
    property double bottom
1190
1704
    property double left
1191
1705
    property double right
1192
1706
    property double top
1193
1707
Ubuntu.Components.UbuntuToolkit.UCMouse: Enum
1194
1708
    AfterItem
1195
1709
    BeforeItem
1196
1710
Ubuntu.Components.UbuntuToolkit.UCNamespace: Enum
1197
1711
    SummaryCaptionStyle
1198
1712
    TitleCaptionStyle
1199
1713
Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1200
1714
    Active
1201
1715
    ConnectionError
1202
1716
    Inactive
1203
1717
    Synchronizing
1204
1718
Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1205
1719
    Session
1206
1720
    System
1207
1721
    Undefined
1208
1722
Ubuntu.Components.UbuntuToolkit.UCSlotsLayout: Enum
1209
1723
    First
1210
1724
    Last
1211
1725
    Leading
1212
1726
    Trailing
1213
1727
UbuntuToolkit.UCStateSaverAttached: QtObject
1214
1728
    property bool enabled
1215
1729
    property string properties
1216
1730
Ubuntu.Components.UbuntuToolkit.UCSwipeEvent: Enum
1217
1731
    Finished
1218
1732
    Started
1219
1733
    Updated
1220
1734
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1221
1735
    Repeat
1222
1736
    Transparent
1223
1737
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1224
1738
    AlignBottom
1225
1739
    AlignTop
1226
1740
    AlignVCenter
1227
1741
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1228
1742
    AlignHCenter
1229
1743
    AlignLeft
1230
1744
    AlignRight
1231
1745
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1232
1746
    Pad
1233
1747
    PreserveAspectCrop
1234
1748
    PreserveAspectFit
1235
1749
    Stretch
1236
1750
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1237
1751
    SolidColor
1238
1752
    VerticalGradient
1239
1753
Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1240
1754
    DropShadow
1241
1755
    Flat
1242
1756
    Inset
1243
1757
Ubuntu.Components.UbuntuToolkit.UCViewItemsAttached: Enum
1244
1758
    CollapseOnOutsidePress
1245
1759
    Exclusive
1246
1760
    UnlockExpanded
1247
1761
Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
1756
Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
1248
1762
    signal opened(QStringList uris)
1757
    signal opened(QStringList uris)
1249
1763
Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
1758
Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
1250
@@ -1781,10 +1776,14 @@
1251
1781
    property list<int> expandedIndices
1776
    property list<int> expandedIndices
1252
1782
    property int expansionFlags
1777
    property int expansionFlags
1253
1783
    signal selectedIndicesChanged(list<int> indices)
1778
    signal selectedIndicesChanged(list<int> indices)
1255
1784
    signal dragUpdated(UCDragEvent event)
1779
    signal dragUpdated(ListItemDrag event)
1256
1785
    signal expandedIndicesChanged(list<int> indices)
1780
    signal expandedIndicesChanged(list<int> indices)
1257
1786
    property bool selectMode
1781
    property bool selectMode
1258
1787
    property list<int> selectedIndices
1782
    property list<int> selectedIndices
1259
1783
Ubuntu.Components.ViewItems.ExpansionFlag: Enum
1260
1784
    CollapseOnOutsidePress
1261
1785
    Exclusive
1262
1786
    UnlockExpanded
1263
1788
Ubuntu.Components.i18n 1.0 0.1: QtObject
1787
Ubuntu.Components.i18n 1.0 0.1: QtObject
1264
1789
    property string domain
1788
    property string domain
1265
1790
    property string language
1789
    property string language
1266
1791
1790
1267
=== modified file 'tests/api/components.api'
1268
--- tests/api/components.api	2015-12-18 15:26:04 +0000
1269
+++ tests/api/components.api	2016-07-04 16:15:32 +0000
1270
@@ -11,21 +11,21 @@
1271
11
Extinct.Animals.Europe 4.2: Europe
11
Extinct.Animals.Europe 4.2: Europe
1272
12
    readonly property ushort era 4.2
12
    readonly property ushort era 4.2
1273
13
    function ushort era(uchar year)
13
    function ushort era(uchar year)
1274
14
Extinct.Animals.Europe.ModernContinent: Enum
1275
15
    America
1276
16
    Europe
1277
17
Extinct.Animals.Excavator 1.0 1.1
14
Extinct.Animals.Excavator 1.0 1.1
1278
18
Extinct.Animals.Gigantophis 4.3: QQuickItem
15
Extinct.Animals.Gigantophis 4.3: QQuickItem
1279
19
    property bool extinct
16
    property bool extinct
1280
20
    function var first()
17
    function var first()
1281
21
    function var fourth()
18
    function var fourth()
1282
19
Extinct.Animals.ModernContinent: Enum
1283
20
    America
1284
21
    Europe
1285
22
Extinct.Animals.ModernContinent: Enum
1286
23
    America
1287
24
    Europe
1288
22
Extinct.Animals.Pangaea 1.0: QtObject singleton
25
Extinct.Animals.Pangaea 1.0: QtObject singleton
1289
23
Extinct.Animals.Pangaea 4.0: Pangaea singleton
26
Extinct.Animals.Pangaea 4.0: Pangaea singleton
1290
24
    readonly property ushort era 4.0
27
    readonly property ushort era 4.0
1291
25
    function ushort era(uchar year)
28
    function ushort era(uchar year)
1292
26
Extinct.Animals.Pangaea.ModernContinent: Enum
1293
27
    America
1294
28
    Europe
1295
29
Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
29
Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
1296
30
    function string paw(int i)
30
    function string paw(int i)
1297
31
    property string name
31
    property string name
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration	2016-07-04	Approve on 2016-07-11
Tim Peeters		2016-07-04	Approve on 2016-07-11
Review via email: mp+299048@code.launchpad.net