Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/listsAndNameSpaces into lp:ubuntu-ui-toolkit/staging
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tim Peeters on 2016-07-11 | ||||
| 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 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | 2016-07-04 | Approve on 2016-07-11 |
| Tim Peeters | 2016-07-04 | Approve on 2016-07-11 | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-06-24.
Commit Message
More robust list and namespace handling in apicheck
FAILED: Continuous integration, rev:2019
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2019
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2019
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2019
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2020
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2020
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2020
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2020
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2020
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2021
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| Tim Peeters (tpeeters) wrote : | # |
We should show the modules for the parent components, but that can be done in a separate MR. See https:/
PASSED: Continuous integration, rev:2021
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2021
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2021
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2021
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2022
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| Christian 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<UbuntuTool
> 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 QQmlListPropert
> +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 dragDirectionCh
> Why does the function parameter still have the CPP name?
Bug indeed (was "BottomEdge.
> +UCActionContex
> why is this not the QML component name?
Not a regression caused by introducing namespaces.
> +Ubuntu.
> this shows the qml module name with the cpp class name.
Bug indeed (was "Ubuntu.
PASSED: Continuous integration, rev:2022
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2022
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2022
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2022
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Christian 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.
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2023
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2024. By Christian Dywan on 2016-07-04
FAILED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2024
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2024
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/

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