Merge lp://staging/~bzoltan/ubuntu-ui-toolkit/test_1 into lp://staging/ubuntu-ui-toolkit
Proposed by
Zoltan Balogh
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~bzoltan/ubuntu-ui-toolkit/test_1 |
Merge into: | lp://staging/ubuntu-ui-toolkit |
Diff against target: |
2837 lines (+1049/-284) 66 files modified
apicheck/apicheck.cpp (+10/-0) components.api (+53/-51) debian/control (+9/-0) debian/libubuntugestures5-private-dev.install (+3/-0) documentation/ubuntu-components.qdoc (+1/-1) documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1) examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+2/-2) examples/ubuntu-ui-toolkit-gallery/Label.qml (+6/-6) examples/ubuntu-ui-toolkit-gallery/MainPage.qml (+17/-27) examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+7/-3) src/Ubuntu/Components/1.2/TextField.qml (+1/-1) src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+1/-0) src/Ubuntu/Components/1.3/AppHeader.qml (+5/-0) src/Ubuntu/Components/1.3/MainView.qml (+3/-20) src/Ubuntu/Components/1.3/TextField.qml (+19/-1) src/Ubuntu/Components/1.3/UbuntuListView.qml (+178/-9) src/Ubuntu/Components/1.3/UbuntuListView11.qdoc (+0/-38) src/Ubuntu/Components/ComponentModule.pro (+0/-2) src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+1/-1) src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+9/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml (+4/-2) src/Ubuntu/Components/plugin/plugin.cpp (+3/-1) src/Ubuntu/Components/plugin/plugin.pri (+1/-4) src/Ubuntu/Components/plugin/quickutils.cpp (+2/-1) src/Ubuntu/Components/plugin/quickutils.h (+7/-0) src/Ubuntu/Components/plugin/ucaction.cpp (+114/-16) src/Ubuntu/Components/plugin/ucaction.h (+8/-1) src/Ubuntu/Components/plugin/ucbottomedge.cpp (+1/-1) src/Ubuntu/Components/plugin/ucbottomedgehint.cpp (+1/-1) src/Ubuntu/Components/plugin/ucfontutils.h (+6/-6) src/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+11/-5) src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+3/-1) src/Ubuntu/Components/qmldir (+1/-1) src/Ubuntu/Test/plugin/plugin.pri (+2/-1) src/Ubuntu/Test/plugin/uctestextras.cpp (+18/-0) src/Ubuntu/Test/plugin/uctestextras.h (+2/-0) src/Ubuntu/UbuntuGestures/UbuntuGestures.pro (+6/-0) src/Ubuntu/UbuntuGestures/damper.cpp (+1/-1) src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+8/-8) src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+2/-3) src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+7/-6) tests/api/Extinct/Animals/AnimalModule.pro (+1/-1) tests/api/Extinct/Animals/plugin/plugin.cpp (+2/-0) tests/api/Extinct/Animals/plugin/plugin.pri (+2/-0) tests/api/Extinct/Animals/plugin/tarpan.cpp (+59/-0) tests/api/Extinct/Animals/plugin/tarpan.h (+46/-0) tests/api/Extinct/Animals/qmldir (+1/-1) tests/api/components.api (+11/-8) tests/autopilot/ubuntuuitoolkit/__init__.py (+2/-0) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+3/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py (+4/-0) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py (+1/-1) tests/uitk_test_plan.sh (+2/-0) tests/unit/plugin_dependency.pri (+1/-1) tests/unit/runtest.sh (+1/-1) tests/unit/tst_components/tst_fontutils.qml (+13/-14) tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp (+1/-1) tests/unit_x11/tst_bottomedge/tst_bottomedge.pro (+1/-1) tests/unit_x11/tst_components/battery-100-charging.svg (+25/-0) tests/unit_x11/tst_components/shape.svg (+77/-0) tests/unit_x11/tst_components/tst_imageprovider.qml (+29/-4) tests/unit_x11/tst_components/tst_scrollbar.qml (+67/-25) tests/unit_x11/tst_components/tst_shortcuts.qml (+58/-0) tests/unit_x11/tst_components/tst_ubuntulistview13.qml (+105/-0) tests/unit_x11/tst_swipearea/tst_swipearea.cpp (+2/-2) tests/unit_x11/tst_swipearea/tst_swipearea.pro (+1/-1) |
To merge this branch: | bzr merge lp://staging/~bzoltan/ubuntu-ui-toolkit/test_1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2016-01-07.
Commit message
test 1
Description of the change
test 1
To post a comment you must log in.
Unmerged revisions
- 1799. By Zoltan Balogh
-
test Jenkins