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: Merged
Approved by: Tim Peeters
Approved revision: 2024
Merged at revision: 2030
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 1297 lines (+337/-327)
3 files modified
apicheck/apicheck.cpp (+30/-19)
components.api (+301/-302)
tests/api/components.api (+6/-6)
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 Approve
Tim Peeters Approve
Review via email: mp+299048@code.launchpad.net

This proposal supersedes a proposal from 2016-06-24.

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Tim Peeters (tpeeters) wrote : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

> 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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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)
Revision history for this message
Cris Dywan (kalikiana) wrote : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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 : Posted in a previous version of this proposal

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)
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/808/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4238/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/808/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/1003/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4239/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1003/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/1027/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4240/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1027/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/782/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4241/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/782/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/516/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1003/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1027/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/808/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/782/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4242/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4239
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4240
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4238
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4241

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/516/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

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

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

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

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

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

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

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

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

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

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

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

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

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

FAILED: Continuous integration, rev:2024
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/519/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1007/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1031
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/812
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/786
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4268/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4260
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4266
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4265
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4267

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

okay, thanks.

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

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

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

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

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

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

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

PASSED: Continuous integration, rev:2024
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1024/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4351/console

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

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

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

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

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

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 16:15:32 +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 16:15:32 +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,7 +502,7 @@
449 property bool useDeprecatedToolbar
450 Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
451 property string text
452-Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: UbuntuToolkit.UCStyledItemBase
453+Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: StyledItem
454 property bool automaticHeight
455 property bool exposed
456 property Flickable flickable
457@@ -458,7 +519,7 @@
458 property color keyColor
459 property string name
460 property url source
461-Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: UbuntuToolkit.UCMouse
462+Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: Mouse
463 Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea
464 function bool contains(QPointF point)
465 property Item sensingArea
466@@ -494,21 +555,28 @@
467 Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
468 property string fontSize
469 property TextSize textSize
470+Ubuntu.Components.Label.TextSize: Enum
471+ Large
472+ Medium
473+ Small
474+ XLarge
475+ XSmall
476+ XxSmall
477 Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
478 readonly property string currentLayout
479 property list<ConditionalLayout> layouts
480-Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: UbuntuToolkit.UCStyledItemBase
481- property UbuntuToolkit.UCAction action
482+Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: StyledItem
483+ property Action action
484 property color color
485 readonly property Item contentItem
486 readonly property bool contentMoving
487- readonly property UbuntuToolkit.UCListItemDivider divider
488+ readonly property UCListItemDivider divider
489 property bool dragMode
490 readonly property bool dragging
491- readonly property UbuntuToolkit.UCListItemExpansion expansion 1.3
492+ readonly property UCListItemExpansion expansion 1.3
493 property color highlightColor
494 readonly property bool highlighted
495- property UbuntuToolkit.UCListItemActions leadingActions
496+ property ListItemActions leadingActions
497 property list<Item> listItemChildren
498 default property list<QtObject> listItemData
499 signal clicked()
500@@ -519,9 +587,9 @@
501 property bool selected
502 property bool swipeEnabled 1.3
503 readonly property bool swiped 1.3
504- property UbuntuToolkit.UCListItemActions trailingActions
505+ property ListItemActions trailingActions
506 Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject
507- property list<UbuntuToolki>.UCAction> actions
508+ property list<Action> actions
509 default property list<QtObject> data
510 property Component delegate
511 Ubuntu.Components.ListItemDrag 1.2: QtObject
512@@ -531,23 +599,33 @@
513 property int minimumIndex
514 readonly property Status status
515 readonly property int to
516-Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: UbuntuToolkit.UCSlotsLayout
517- readonly property UbuntuToolkit.UCLabel subtitle
518- readonly property UbuntuToolkit.UCLabel summary
519- readonly property UbuntuToolkit.UCLabel title
520+Ubuntu.Components.ListItemDrag.Status: Enum
521+ Dropped
522+ Moving
523+ Started
524+Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: SlotsLayout
525+ readonly property Label subtitle
526+ readonly property Label summary
527+ readonly property Label title
528 Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item
529 readonly property bool animatePanels
530 property Item dragPanel
531 property PropertyAnimation dropAnimation
532 readonly property Flickable flickable 1.3
533 readonly property int listItemIndex 1.3
534- function swipeEvent(UCSwipeEvent event)
535+ function swipeEvent(SwipeEvent event)
536 function rebound()
537 property Animation snapAnimation
538 Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject
539 property Frequency frequency
540 signal trigger()
541 property QDateTime relativeTime
542+Ubuntu.Components.LiveTimer.Frequency: Enum
543+ Disabled
544+ Hour
545+ Minute
546+ Relative
547+ Second
548 Ubuntu.Components.MainView 1.0 0.1: MainViewBase
549 property bool automaticOrientation
550 default property list<QtObject> contentsItem
551@@ -555,13 +633,13 @@
552 Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
553 property bool automaticOrientation
554 default property list<QtObject> contentsItem
555-Ubuntu.Components.MainView 1.3: UbuntuToolkit.UCMainViewBase
556+Ubuntu.Components.MainView 1.3: MainViewBase
557 property bool automaticOrientation
558 default property list<QtObject> contentsItem
559-Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: UbuntuToolkit.UCPageTreeNode
560- readonly property UbuntuToolkit.UCPopupContext actionContext
561- readonly property UbuntuToolkit.UCActionManager actionManager
562- property list<UbuntuToolki>.UCAction> actions
563+Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: PageTreeNode
564+ readonly property PopupContext actionContext
565+ readonly property ActionManager actionManager
566+ property list<Action> actions
567 property bool anchorToKeyboard
568 property string applicationName
569 property color backgroundColor
570@@ -572,8 +650,8 @@
571 signal headerColorChanged(color headerColor)
572 signal backgroundColorChanged(color backgroundColor)
573 signal footerColorChanged(color footerColor)
574- signal actionManagerChanged(UbuntuToolkit.UCActionManager actionManager)
575- signal actionContextChanged(UbuntuToolkit.UCPopupContext actionContext)
576+ signal actionManagerChanged(ActionManager actionManager)
577+ signal actionContextChanged(PopupContext actionContext)
578 Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
579 function double clamp(double x, double min, double max)
580 function double lerp(double delta, double from, double to)
581@@ -602,6 +680,9 @@
582 signal entered(QQuickMouseEvent event, Item host)
583 signal exited(QQuickMouseEvent event, Item host)
584 property Priority priority
585+Ubuntu.Components.Mouse.Priority: Enum
586+ AfterItem
587+ BeforeItem
588 Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
589 property bool enabled
590 signal enabledChanged(bool value)
591@@ -664,14 +745,14 @@
592 readonly property bool rotating
593 property bool transitionEnabled
594 Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
595- property list<UbuntuToolki>.UCAction> actions
596+ property list<Action> actions
597 property Flickable flickable
598 property string title
599 property Item tools
600 Ubuntu.Components.Page 1.1 Page11: Page10
601 readonly property PageHeadConfiguration head
602-Ubuntu.Components.Page 1.3: UbuntuToolkit.UCPageTreeNode
603- readonly property UbuntuToolkit.UCActionContext actionContext
604+Ubuntu.Components.Page 1.3: PageTreeNode
605+ readonly property ActionContext actionContext
606 property Flickable flickable
607 readonly property PageHeadConfiguration head
608 property Item header
609@@ -682,18 +763,18 @@
610 property double minimumWidth
611 property double preferredWidth
612 Ubuntu.Components.PageColumnsLayout 1.3: QtObject
613- default property list<PageColum> data
614+ default property list<PageColumn> data
615 property bool when
616 Ubuntu.Components.PageHeadConfiguration 1.1: Object
617- property list<UbuntuToolki>.UCAction> actions
618- property UbuntuToolkit.UCAction backAction
619+ property list<Action> actions
620+ property Action backAction
621 property Item contents
622 property color foregroundColor
623 property string preset
624 readonly property PageHeadSections sections
625 Ubuntu.Components.PageHeadConfiguration 1.3: Object
626- property list<UbuntuToolki>.UCAction> actions
627- property UbuntuToolkit.UCAction backAction
628+ property list<Action> actions
629+ property Action backAction
630 property Item contents
631 property Flickable flickable
632 property color foregroundColor
633@@ -707,18 +788,18 @@
634 property var model
635 property int selectedIndex
636 Ubuntu.Components.PageHeadSections 1.3: QtObject
637- property list<UbuntuToolki>.UCAction> actions
638+ property list<Action> actions
639 property bool enabled
640 property var model
641 property int selectedIndex
642 Ubuntu.Components.PageHeadState 1.1: State
643- property list<UbuntuToolki>.UCAction> actions
644- property UbuntuToolkit.UCAction backAction
645+ property list<Action> actions
646+ property Action backAction
647 property Item contents
648 property PageHeadConfiguration head
649 Ubuntu.Components.PageHeadState 1.3: State
650- property list<UbuntuToolki>.UCAction> actions
651- property UbuntuToolkit.UCAction backAction
652+ property list<Action> actions
653+ property Action backAction
654 property Item contents
655 property PageHeadConfiguration head
656 Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
657@@ -740,11 +821,11 @@
658 property color textColor
659 property double textLeftMargin
660 property int textSize
661-Ubuntu.Components.PageHeader 1.3: UbuntuToolkit.UCHeader
662+Ubuntu.Components.PageHeader 1.3: Header
663 property Item contents
664 property Item extension
665 readonly property ActionBar leadingActionBar
666- property list<UbuntuToolki>.UCAction> navigationActions
667+ property list<Action> navigationActions
668 readonly property Sections sections
669 property string subtitle
670 property string title
671@@ -765,19 +846,19 @@
672 function var push(var page, var properties)
673 function var pop()
674 function var clear()
675-Ubuntu.Components.PageStack 1.3: UbuntuToolkit.UCPageTreeNode
676+Ubuntu.Components.PageStack 1.3: PageTreeNode
677 property Item currentPage
678 property int depth
679 function var push(var page, var properties)
680 function var pop()
681 function var clear()
682-Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: UbuntuToolkit.UCStyledItemBase
683+Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: StyledItem
684 property bool active
685 readonly property Item activeLeafNode
686 property bool isLeaf
687 signal isLeafChanged(bool isLeaf)
688 signal activeChanged(bool active)
689- signal parentNodeChanged(UbuntuToolkit.UCPageTreeNode parentNode)
690+ signal parentNodeChanged(PageTreeNode parentNode)
691 signal pageStackChanged(Item pageStack)
692 signal activeLeafNodeChanged(Item activeLeafNode)
693 signal propagatedChanged(QtObject propagated)
694@@ -785,7 +866,7 @@
695 signal isPageTreeNodeChanged(bool isPageTreeNode)
696 function dumpNodeTree()
697 property Item pageStack
698- property UbuntuToolkit.UCPageTreeNode parentNode
699+ property PageTreeNode parentNode
700 property Item toolbar
701 Ubuntu.Components.Themes.Palette 0.1: QtObject
702 property PaletteValues normal
703@@ -868,7 +949,7 @@
704 property double triggerSize
705 Ubuntu.PerformanceMetrics.PerformanceOverlay 1.0 0.1: Item
706 property bool active
707-Ubuntu.Components.Pickers.Picker 1.0 0.1: UbuntuToolkit.UCStyledItemBase
708+Ubuntu.Components.Pickers.Picker 1.0 0.1: StyledItem
709 property bool circular
710 property Component delegate
711 property bool live
712@@ -876,7 +957,7 @@
713 property var model
714 readonly property bool moving
715 property int selectedIndex
716-Ubuntu.Components.Pickers.Picker 1.3: UbuntuToolkit.UCStyledItemBase
717+Ubuntu.Components.Pickers.Picker 1.3: StyledItem
718 property bool circular
719 property Component delegate
720 property double itemHeight
721@@ -887,7 +968,7 @@
722 property int selectedIndex
723 Ubuntu.Components.Pickers.PickerDelegate 1.0 0.1: AbstractButton
724 readonly property Picker picker
725-Ubuntu.Components.Pickers.PickerDelegate 1.3: UbuntuToolkit.UCAbstractButton
726+Ubuntu.Components.Pickers.PickerDelegate 1.3: AbstractButton
727 readonly property Picker picker
728 Ubuntu.Components.Pickers.PickerPanel 1.0 0.1: Object singleton
729 function var openDatePicker(var caller, var property, var mode)
730@@ -919,7 +1000,7 @@
731 property Item pointerTarget
732 property Component style
733 property string styleName
734- property UbuntuToolkit.UCTheme theme
735+ property ThemeSettings theme
736 Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
737 property Item dismissArea
738 property PropertyAnimation fadingAnimation
739@@ -932,7 +1013,7 @@
740 property bool grabDismissAreaEvents
741 function var show()
742 function var hide()
743-Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: UbuntuToolkit.UCActionContext
744+Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: ActionContext
745 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
746 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
747 property bool indeterminate
748@@ -955,15 +1036,15 @@
749 property color keyColor
750 property string name
751 property url source
752-Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuToolkit.UCUbuntuShape
753-Ubuntu.Components.PullToRefresh 1.1: UbuntuToolkit.UCStyledItemBase
754+Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuShape
755+Ubuntu.Components.PullToRefresh 1.1: StyledItem
756 property Component content
757 signal refresh()
758 readonly property double offset
759 property bool refreshing
760 readonly property bool releaseToRefresh
761 property Flickable target
762-Ubuntu.Components.PullToRefresh 1.3: UbuntuToolkit.UCStyledItemBase
763+Ubuntu.Components.PullToRefresh 1.3: StyledItem
764 property Component content
765 signal refresh()
766 readonly property double offset
767@@ -974,27 +1055,26 @@
768 property double activationThreshold
769 property Component defaultContent
770 property bool releaseToRefresh
771-Ubuntu.Components.QQuickImageBase 1.0 0.1 UbuntuToolkit::UCQQuickImageExtension: QQuickImageBase
772 Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
773 readonly property UPMGraphModel graphModel
774 signal frameRendered(qlonglong renderTime)
775 property int period
776 property int samples
777 property RenderTimer.TimerType timerType
778-Ubuntu.Components.ScrollView 1.3: UbuntuToolkit.UCStyledItemBase
779+Ubuntu.Components.ScrollView 1.3: StyledItem
780 default property Item contentItem
781 readonly property Flickable flickableItem
782 property Scrollbar horizontalScrollbar
783 property Scrollbar verticalScrollbar
784 readonly property Item viewport
785-Ubuntu.Components.Scrollbar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
786- property int align
787- property Flickable flickableItem
788-Ubuntu.Components.Scrollbar 1.3: UbuntuToolkit.UCStyledItemBase
789- property int align
790- property Flickable flickableItem
791-Ubuntu.Components.Sections 1.3: UbuntuToolkit.UCStyledItemBase
792- property list<UbuntuToolki>.UCAction> actions
793+Ubuntu.Components.Scrollbar 1.0 0.1: StyledItem
794+ property int align
795+ property Flickable flickableItem
796+Ubuntu.Components.Scrollbar 1.3: StyledItem
797+ property int align
798+ property Flickable flickableItem
799+Ubuntu.Components.Sections 1.3: StyledItem
800+ property list<Action> actions
801 property var model
802 property int selectedIndex
803 Ubuntu.Components.Styles.SectionsStyle 1.3: Item
804@@ -1011,6 +1091,15 @@
805 property string serviceInterface 1.1
806 readonly property Status status 1.1
807 property ServiceType type 1.1
808+Ubuntu.Components.ServiceProperties.ServiceType: Enum
809+ Session
810+ System
811+ Undefined
812+Ubuntu.Components.ServiceProperties.Status: Enum
813+ Active
814+ ConnectionError
815+ Inactive
816+ Synchronizing
817 Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
818 default property list<QtObject> container
819 property double contentsHeight
820@@ -1031,7 +1120,7 @@
821 property string value
822 Ubuntu.Components.ListItems.SingleValue 1.3: Base
823 property string value
824-Ubuntu.Components.Slider 1.0 0.1: UbuntuToolkit.UCStyledItemBase
825+Ubuntu.Components.Slider 1.0 0.1: StyledItem
826 property bool live
827 property double maximumValue
828 signal touched(bool onThumb)
829@@ -1039,7 +1128,7 @@
830 property double minimumValue
831 readonly property bool pressed
832 property double value
833-Ubuntu.Components.Slider 1.3: UbuntuToolkit.UCStyledItemBase
834+Ubuntu.Components.Slider 1.3: StyledItem
835 property bool live
836 property double maximumValue
837 signal touched(bool onThumb)
838@@ -1051,11 +1140,16 @@
839 Ubuntu.Components.SliderUtils 0.1 1.0
840 Ubuntu.Components.SlotsAttached 1.3: QtObject
841 property bool overrideVerticalPositioning
842- readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
843- property UbuntuToolkit.UCSlotsLayout position
844+ readonly property SlotsLayoutPadding padding
845+ property SlotsLayout.UCSlotPosition position
846 Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item
847 property Item mainSlot
848- readonly property UbuntuToolkit.UCSlotsLayoutPadding padding
849+ readonly property SlotsLayoutPadding padding
850+Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
851+ First
852+ Last
853+ Leading
854+ Trailing
855 Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject
856 property double bottom
857 property double leading
858@@ -1066,11 +1160,11 @@
859 property string property
860 Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel
861 readonly property int count
862- readonly property UbuntuToolkit.FilterBehavior filter
863+ readonly property FilterBehavior filter
864 function QVariantMap get(int row)
865 function int count()
866 property QAbstractItemModel model
867- readonly property UbuntuToolkit.SortBehavior sort
868+ readonly property SortBehavior sort
869 Ubuntu.Components.ListItems.Standard 1.0 0.1: Empty
870 property Item control
871 property string fallbackIconName
872@@ -1096,7 +1190,7 @@
873 function bool requestFocus() 1.3
874 property Component style
875 property string styleName 1.3
876- property UbuntuToolkit.UCTheme theme 1.3
877+ property ThemeSettings theme 1.3
878 Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
879 property string subText
880 Ubuntu.Components.ListItems.Subtitled 1.3: Base
881@@ -1116,26 +1210,37 @@
882 signal grabGestureChanged(bool grabGesture)
883 readonly property bool pressed
884 readonly property QPointF touchPosition
885+Ubuntu.Components.SwipeArea.Direction: Enum
886+ Downwards
887+ Horizontal
888+ Leftwards
889+ Rightwards
890+ Upwards
891+ Vertical
892 Ubuntu.Components.SwipeEvent 1.2: QtObject
893 property QPointF content
894 readonly property QPointF from
895 readonly property Status status
896 readonly property QPointF to
897+Ubuntu.Components.SwipeEvent.Status: Enum
898+ Finished
899+ Started
900+ Updated
901 Ubuntu.Components.Switch 1.0 0.1: AbstractButton
902 property bool checked
903-Ubuntu.Components.Switch 1.3: UbuntuToolkit.UCAbstractButton
904+Ubuntu.Components.Switch 1.3: AbstractButton
905 property bool checked
906 Ubuntu.Components.Tab 1.0 0.1: PageTreeNode
907 property url iconSource
908 readonly property int index
909 property Item page
910 property string title
911-Ubuntu.Components.Tab 1.3: UbuntuToolkit.UCPageTreeNode
912+Ubuntu.Components.Tab 1.3: PageTreeNode
913 property url iconSource
914 readonly property int index
915 property Item page
916 property string title
917-Ubuntu.Components.TabBar 1.0 0.1: UbuntuToolkit.UCStyledItemBase
918+Ubuntu.Components.TabBar 1.0 0.1: StyledItem
919 property bool alwaysSelectionMode
920 property bool animate
921 property var model
922@@ -1143,7 +1248,7 @@
923 property int selectedIndex
924 property bool selectionMode
925 property Item tabsItem
926-Ubuntu.Components.TabBar 1.3: UbuntuToolkit.UCStyledItemBase
927+Ubuntu.Components.TabBar 1.3: StyledItem
928 property bool alwaysSelectionMode
929 property bool animate
930 property var model
931@@ -1158,7 +1263,7 @@
932 property int selectedTabIndex
933 property TabBar tabBar
934 default property list<QtObject> tabChildren
935-Ubuntu.Components.Tabs 1.3: UbuntuToolkit.UCPageTreeNode
936+Ubuntu.Components.Tabs 1.3: PageTreeNode
937 readonly property int count
938 readonly property Item currentPage
939 readonly property Tab selectedTab
940@@ -1184,7 +1289,7 @@
941 function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
942 function removeTimeConstraintsFromSwipeArea(Item item)
943 readonly property bool touchPresent
944-Ubuntu.Components.TextArea 1.0 0.1: UbuntuToolkit.UCStyledItemBase
945+Ubuntu.Components.TextArea 1.0 0.1: StyledItem
946 property bool autoExpand
947 property bool autoSize
948 property url baseUrl
949@@ -1242,7 +1347,7 @@
950 property int textFormat
951 property int verticalAlignment
952 property int wrapMode
953-Ubuntu.Components.TextArea 1.3: UbuntuToolkit.UCStyledItemBase
954+Ubuntu.Components.TextArea 1.3: StyledItem
955 property bool autoExpand
956 property bool autoSize
957 property url baseUrl
958@@ -1303,7 +1408,7 @@
959 property int textFormat
960 property int verticalAlignment
961 property int wrapMode
962-Ubuntu.Components.TextField 1.0 0.1: UbuntuToolkit.UCActionItem
963+Ubuntu.Components.TextField 1.0 0.1: ActionItem
964 readonly property bool acceptableInput
965 property bool autoScroll
966 readonly property bool canPaste
967@@ -1364,7 +1469,7 @@
968 readonly property int selectionStart
969 property QValidator validator
970 property int verticalAlignment
971-Ubuntu.Components.TextField 1.3: UbuntuToolkit.UCActionItem
972+Ubuntu.Components.TextField 1.3: ActionItem
973 readonly property bool acceptableInput
974 property bool autoScroll
975 readonly property bool canPaste
976@@ -1430,24 +1535,24 @@
977 Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject
978 property string name
979 property QtObject palette
980- readonly property UbuntuToolkit.UCTheme parentTheme
981+ readonly property ThemeSettings parentTheme
982 Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
983 Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
984 Ubuntu.Components.Toolbar 0.1: Panel
985 property Item tools
986-Ubuntu.Components.Toolbar 1.3: UbuntuToolkit.UCStyledItemBase
987+Ubuntu.Components.Toolbar 1.3: StyledItem
988 readonly property ActionBar leadingActionBar
989 readonly property ActionBar trailingActionBar
990-Ubuntu.Components.ToolbarButton 1.0 0.1: UbuntuToolkit.UCStyledItemBase
991- property UbuntuToolkit.UCAction action
992+Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
993+ property Action action
994 property string iconName
995 property url iconSource
996 signal triggered(var value)
997 function trigger(var value)
998 function trigger()
999 property string text
1000-Ubuntu.Components.ToolbarButton 1.3: UbuntuToolkit.UCStyledItemBase
1001- property UbuntuToolkit.UCAction action
1002+Ubuntu.Components.ToolbarButton 1.3: StyledItem
1003+ property Action action
1004 property string iconName
1005 property url iconSource
1006 signal triggered(var value)
1007@@ -1468,12 +1573,28 @@
1008 property Item pageStack
1009 Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
1010 property Component defaultDelegate
1011+UCActionContextAttached: QtObject
1012 Ubuntu.Components.UCApplication 1.0 0.1: QtObject
1013 property string applicationName
1014 property QtObject inputMethod
1015 Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
1016 function double sizeToPixels(string size)
1017 function double modularScale(string size)
1018+UCListItemDivider: Item
1019+ property color colorFrom
1020+ property color colorTo
1021+UCListItemExpansion: QtObject
1022+ property bool expanded
1023+ property double height
1024+UCMargins: QtObject
1025+ property double all
1026+ property double bottom
1027+ property double left
1028+ property double right
1029+ property double top
1030+UCStateSaverAttached: QtObject
1031+ property bool enabled
1032+ property string properties
1033 Ubuntu.Components.UCUnits 1.0 0.1: QtObject
1034 property float gridUnit
1035 function float dp(float value)
1036@@ -1486,11 +1607,14 @@
1037 property int samples
1038 readonly property int shift
1039 Ubuntu.Components.Ubuntu 1.2: QtObject singleton
1040-Ubuntu.Components.Ubuntu 1.3: UbuntuToolkit.UCNamespace singleton
1041+Ubuntu.Components.Ubuntu 1.3: Ubuntu singleton
1042 function ushort version(uchar major, uchar minor)
1043 readonly property ushort toolkitVersion
1044 readonly property ushort toolkitVersionMajor
1045 readonly property ushort toolkitVersionMinor
1046+Ubuntu.Components.Ubuntu.CaptionsStyle: Enum
1047+ SummaryCaptionStyle
1048+ TitleCaptionStyle
1049 Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton
1050 readonly property int BriskDuration
1051 readonly property int FastDuration
1052@@ -1545,13 +1669,6 @@
1053 readonly property color silk
1054 readonly property color slate
1055 readonly property color warmGrey
1056-Ubuntu.Components.UbuntuGestures.UCSwipeArea: Enum
1057- Downwards
1058- Horizontal
1059- Leftwards
1060- Rightwards
1061- Upwards
1062- Vertical
1063 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
1064 property int expandedIndex
1065 Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
1066@@ -1584,7 +1701,30 @@
1067 property WrapMode sourceVerticalWrapMode 1.3
1068 property bool stretched
1069 property VAlignment verticalAlignment
1070-Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuToolkit.UCUbuntuShape
1071+Ubuntu.Components.UbuntuShape.Aspect: Enum
1072+ DropShadow
1073+ Flat
1074+ Inset
1075+Ubuntu.Components.UbuntuShape.BackgroundMode: Enum
1076+ SolidColor
1077+ VerticalGradient
1078+Ubuntu.Components.UbuntuShape.FillMode: Enum
1079+ Pad
1080+ PreserveAspectCrop
1081+ PreserveAspectFit
1082+ Stretch
1083+Ubuntu.Components.UbuntuShape.HAlignment: Enum
1084+ AlignHCenter
1085+ AlignLeft
1086+ AlignRight
1087+Ubuntu.Components.UbuntuShape.VAlignment: Enum
1088+ AlignBottom
1089+ AlignTop
1090+ AlignVCenter
1091+Ubuntu.Components.UbuntuShape.WrapMode: Enum
1092+ Repeat
1093+ Transparent
1094+Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuShape
1095 property color overlayColor
1096 property QRectF overlayRect
1097 Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
1098@@ -1613,151 +1753,6 @@
1099 function var warningFormat(var line, var column, var message)
1100 function var waitForHeaderAnimation(var mainView)
1101 readonly property QuickTestUtil testUtil
1102-Ubuntu.Components.UbuntuToolkit.LiveTimer: Enum
1103- Disabled
1104- Hour
1105- Minute
1106- Relative
1107- Second
1108-Ubuntu.Components.UbuntuToolkit.UCAction: Enum
1109- Bool
1110- Integer
1111- None
1112- Object
1113- Real
1114- String
1115-UbuntuToolkit.UCActionContextAttached: QtObject
1116-Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1117- Fail
1118- InProgress
1119- Ready
1120-Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1121- Canceling
1122- NoOperation
1123- Reseting
1124- Saving
1125-Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1126- AdaptationError
1127- EarlyDate
1128- InvalidDate
1129- InvalidEvent
1130- NoDaysOfWeek
1131- NoError
1132- OneTimeOnMoreDays
1133- OperationPending
1134-Ubuntu.Components.UbuntuToolkit.UCAlarm: Flag
1135- AutoDetect
1136- Daily
1137- Friday
1138- Monday
1139- Saturday
1140- Sunday
1141- Thursday
1142- Tuesday
1143- Wednesday
1144-Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1145- AutoDetect
1146- Daily
1147- Friday
1148- Monday
1149- Saturday
1150- Sunday
1151- Thursday
1152- Tuesday
1153- Wednesday
1154-Ubuntu.Components.UbuntuToolkit.UCAlarm: Enum
1155- OneTime
1156- Repeating
1157-Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1158- Committed
1159- Hidden
1160- Revealed
1161-Ubuntu.Components.UbuntuToolkit.UCBottomEdge: Enum
1162- Downwards
1163- Undefined
1164- Upwards
1165-Ubuntu.Components.UbuntuToolkit.UCBottomEdgeHint: Enum
1166- Active
1167- Hidden
1168- Inactive
1169- Locked
1170-Ubuntu.Components.UbuntuToolkit.UCDragEvent: Enum
1171- Dropped
1172- Moving
1173- Started
1174-Ubuntu.Components.UbuntuToolkit.UCLabel: Enum
1175- Large
1176- Medium
1177- Small
1178- XLarge
1179- XSmall
1180- XxSmall
1181-UbuntuToolkit.UCListItemDivider: Item
1182- property color colorFrom
1183- property color colorTo
1184-UbuntuToolkit.UCListItemExpansion: QtObject
1185- property bool expanded
1186- property double height
1187-UbuntuToolkit.UCMargins: QtObject
1188- property double all
1189- property double bottom
1190- property double left
1191- property double right
1192- property double top
1193-Ubuntu.Components.UbuntuToolkit.UCMouse: Enum
1194- AfterItem
1195- BeforeItem
1196-Ubuntu.Components.UbuntuToolkit.UCNamespace: Enum
1197- SummaryCaptionStyle
1198- TitleCaptionStyle
1199-Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1200- Active
1201- ConnectionError
1202- Inactive
1203- Synchronizing
1204-Ubuntu.Components.UbuntuToolkit.UCServiceProperties: Enum
1205- Session
1206- System
1207- Undefined
1208-Ubuntu.Components.UbuntuToolkit.UCSlotsLayout: Enum
1209- First
1210- Last
1211- Leading
1212- Trailing
1213-UbuntuToolkit.UCStateSaverAttached: QtObject
1214- property bool enabled
1215- property string properties
1216-Ubuntu.Components.UbuntuToolkit.UCSwipeEvent: Enum
1217- Finished
1218- Started
1219- Updated
1220-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1221- Repeat
1222- Transparent
1223-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1224- AlignBottom
1225- AlignTop
1226- AlignVCenter
1227-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1228- AlignHCenter
1229- AlignLeft
1230- AlignRight
1231-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1232- Pad
1233- PreserveAspectCrop
1234- PreserveAspectFit
1235- Stretch
1236-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1237- SolidColor
1238- VerticalGradient
1239-Ubuntu.Components.UbuntuToolkit.UCUbuntuShape: Enum
1240- DropShadow
1241- Flat
1242- Inset
1243-Ubuntu.Components.UbuntuToolkit.UCViewItemsAttached: Enum
1244- CollapseOnOutsidePress
1245- Exclusive
1246- UnlockExpanded
1247 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
1248 signal opened(QStringList uris)
1249 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
1250@@ -1781,10 +1776,14 @@
1251 property list<int> expandedIndices
1252 property int expansionFlags
1253 signal selectedIndicesChanged(list<int> indices)
1254- signal dragUpdated(UCDragEvent event)
1255+ signal dragUpdated(ListItemDrag event)
1256 signal expandedIndicesChanged(list<int> indices)
1257 property bool selectMode
1258 property list<int> selectedIndices
1259+Ubuntu.Components.ViewItems.ExpansionFlag: Enum
1260+ CollapseOnOutsidePress
1261+ Exclusive
1262+ UnlockExpanded
1263 Ubuntu.Components.i18n 1.0 0.1: QtObject
1264 property string domain
1265 property string language
1266
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 Extinct.Animals.Europe 4.2: Europe
1272 readonly property ushort era 4.2
1273 function ushort era(uchar year)
1274-Extinct.Animals.Europe.ModernContinent: Enum
1275- America
1276- Europe
1277 Extinct.Animals.Excavator 1.0 1.1
1278 Extinct.Animals.Gigantophis 4.3: QQuickItem
1279 property bool extinct
1280 function var first()
1281 function var fourth()
1282+Extinct.Animals.ModernContinent: Enum
1283+ America
1284+ Europe
1285+Extinct.Animals.ModernContinent: Enum
1286+ America
1287+ Europe
1288 Extinct.Animals.Pangaea 1.0: QtObject singleton
1289 Extinct.Animals.Pangaea 4.0: Pangaea singleton
1290 readonly property ushort era 4.0
1291 function ushort era(uchar year)
1292-Extinct.Animals.Pangaea.ModernContinent: Enum
1293- America
1294- Europe
1295 Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
1296 function string paw(int i)
1297 property string name

Subscribers

People subscribed via source and target branches