Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces into lp:ubuntu-ui-toolkit/staging

  1. listsAndNameSpaces
  2. Merge into staging
Proposed by Cris Dywan
Status: Superseded
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 1301 lines (+340/-326) (has conflicts)
3 files modified
apicheck/apicheck.cpp (+30/-19)
components.api (+304/-301)
tests/api/components.api (+6/-6)
Text conflict in components.api
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing
Tim Peeters Needs Fixing
Review via email: mp+298314@code.launchpad.net

This proposal has been superseded by a proposal from 2016-07-04.

Commit message

More robust list and namespace handling in apicheck

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2019
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/987/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4052/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/987/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2019
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/768/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4053/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/768/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2019
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/957/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4054/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/957/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2019
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/742/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4055/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/742/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2019
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/489/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/957/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/987/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/768/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/742/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4056/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4054
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4052
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4053
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4055

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/489/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces updated
2020. By Cris Dywan

Get the QML name of the namespace

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2020
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/959/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4061/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/959/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2020
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/770/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4063/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/770/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2020
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/989/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4064/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/989/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2020
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/744/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4065/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/744/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2020
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/490/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/959/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/989
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/770
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/744
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4066/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4061
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4064
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4063
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4065

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/490/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces updated
2021. By Cris Dywan

Don't leak C++ namespaces into QML type names

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2021
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/963/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4080/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/963/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces updated
2022. By Cris Dywan

Indeed use the nameSpace variable previously declared

Revision history for this message
Tim Peeters (tpeeters) wrote :

We should show the modules for the parent components, but that can be done in a separate MR. See https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1596601

Revision history for this message
Tim Peeters (tpeeters) wrote :

I left a bunch of diff comments below.

review: Needs Fixing
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2021
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/993/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4081/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/993/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2021
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/774/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4082/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/774/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2021
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/748/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4083/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/748/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2021
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/493/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/963/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/993
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/774
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/748
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4084/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4080
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4081
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4082
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4083

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/493/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/964/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4085/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/964/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

> now I'm confused with the syntax

Syntax hasn't changed. You seem to be reading it heuristically like the diff tool which sometimes causes it to produce funky chunks ;-)

> -default property list<UbuntuToolki>.UCAction> actions
> I know I'm commenting on a removed line.
> But how come we had <UbuntuToolki> with the 't' in the end missing?
The list parsing, which I'm replacing in this MR, was flawed. The raw type in this case is QQmlListProperty<UbuntuToolkit::UCAction>.

> +function UCAlarm* get(int index)
> UCAlarm is the Cpp name. Should it be here?
> If yes, then it should have the Cpp namespace too.

That line was "function UCAlarm* get(int index)" before the introduction of namespaces, thus it's not a regression in the context of this MR, which only attempts to fix regressions whilst retaining the namespaces where they make sense.

> +signal dragDirectionChanged(UCBottomEdge direction)
> Why does the function parameter still have the CPP name?

Bug indeed (was "BottomEdge.DragDirection direction" before namespaces).

> +UCActionContextAttached: QtObject
> why is this not the QML component name?

Not a regression caused by introducing namespaces.

> +Ubuntu.Components.UCAlarm: Enum
> this shows the qml module name with the cpp class name.

Bug indeed (was "Ubuntu.Components.Alarm.Status" before namespaces).

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/994/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4086/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/994/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/775/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4087/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/775/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/749/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4088/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/749/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/494/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/964/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/994
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/775
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/749
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4089/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4085
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4086
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4087
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4088

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/494/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces updated
2023. By Cris Dywan

Explicit handling of C++ namespaces vs. Enum/ Flags

Revision history for this message
Cris Dywan (kalikiana) wrote :

Regressions should be fixed now.

> > +function UCAlarm* get(int index)
> > UCAlarm is the Cpp name. Should it be here?
> > If yes, then it should have the Cpp namespace too.

> That line was "function UCAlarm* get(int index)" before the
> introduction of namespaces, thus it's not a regression in the
> context of this MR, which only attempts to fix regressions
> whilst retaining the namespaces where they make sense.

Having said that, I realized by accident that the fix was pretty simple, so I included it now anyway.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/805/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4232/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/805/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1024/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4233/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1024/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/779/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4234/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/779/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1000/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4235/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1000/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/515/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1000/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1024/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/805/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/779/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4236/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4235
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4233
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4232
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4234

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/515/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces updated
2024. By Cris Dywan

Merge lp:ubuntu-ui-toolkit/staging

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches