« back to all changes in this revision
Viewing changes to src/Ubuntu/Components/1.3/Button.qml
- Committer: Benjamin Zeller
- Date: 2015-09-10 08:43:12 UTC
- mfrom: (1585.1.2 staging)
- Revision ID: benjamin.zeller@canonical.com-20150910084312-6eh8n2729jpslgmb
Merge staging
- files added:
- examples/ubuntu-ui-toolkit-gallery/ActionBars.qml
- tests/unit/custom_qpa
- tests/unit/tst_i18n/tst_i18n_LocalizedApp
- tests/unit/tst_i18n/tst_i18n_RelativeTime
- tests/unit/tst_i18n/tst_i18n_RelativeTime/po
- tests/unit/tst_i18n/tst_i18n_RelativeTime/src
- tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit
- tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share
- tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale
- tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale/en
- tests/unit/tst_i18n/tst_i18n_RelativeTime/ubuntu-ui-toolkit/share/locale/en/LC_MESSAGES
- tests/unit/tst_units/dpr1
- tests/unit/tst_units/dpr2
- tests/unit/tst_units/dpr3
- files removed:
- src/Ubuntu/Components/1.2/ActionItem.qml
- files renamed:
- src/Ubuntu/Components/1.3/ColumnMetrics.qml => src/Ubuntu/Components/1.3/PageColumn.qml
- tests/unit/tst_i18n/localizedApp/ => tests/unit/tst_i18n/tst_i18n_LocalizedApp/localizedApp/
- tests/unit/tst_i18n/po/ => tests/unit/tst_i18n/tst_i18n_LocalizedApp/po/
- tests/unit/tst_i18n/src/ => tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/
- tests/unit/tst_i18n/src/tst_i18n.cpp => tests/unit/tst_i18n/tst_i18n_LocalizedApp/src/tst_i18n_LocalizedApp.cpp
- tests/unit/tst_units/tst_units.qrc => tests/unit/tst_units/dpr1/dpr1.qrc
- tests/unit/tst_units/exact_match@8.png => tests/unit/tst_units/dpr1/exact_match@8.png
- tests/unit/tst_units/exact_match_no_suffix.png => tests/unit/tst_units/dpr1/exact_match_no_suffix.png
- tests/unit/tst_units/higher_scale.png => tests/unit/tst_units/dpr1/higher_scale.png
- tests/unit/tst_units/lower_scale.png => tests/unit/tst_units/dpr1/lower_scale.png
- tests/unit/tst_units/resource@1.png => tests/unit/tst_units/dpr1/resource@1.png
- tests/unit/tst_units/resource@10.png => tests/unit/tst_units/dpr1/resource@10.png
- tests/unit/tst_units/resource@15.png => tests/unit/tst_units/dpr1/resource@15.png
- tests/unit/tst_units/resource@18.png => tests/unit/tst_units/dpr1/resource@18.png
- tests/unit/tst_units/resource@19.png => tests/unit/tst_units/dpr1/resource@19.png
- tests/unit/tst_units/resource@8.png => tests/unit/tst_units/dpr1/resource@8.png
- tests/unit/tst_units/resource_only_higher@13.png => tests/unit/tst_units/dpr1/resource_only_higher@13.png
- tests/unit/tst_units/resource_only_smaller@7.png => tests/unit/tst_units/dpr1/resource_only_smaller@7.png
- tests/unit/tst_units/resources_unit => tests/unit/tst_units/dpr1/resources_unit
- tests/unit/tst_units/tst_units.cpp => tests/unit/tst_units/dpr1/tst_units.cpp
- tests/unit_x11/tst_components/tst_header_back_action.qml => tests/unit_x11/tst_components/tst_pagehead_back_action.qml
- tests/unit_x11/tst_components/tst_header_contents_width.qml => tests/unit_x11/tst_components/tst_pagehead_contents_width.qml
- tests/unit_x11/tst_components/tst_header_hidden.qml => tests/unit_x11/tst_components/tst_pagehead_hidden.qml
- tests/unit_x11/tst_components/tst_header_presets.qml => tests/unit_x11/tst_components/tst_pagehead_presets.qml
- tests/unit_x11/tst_components/tst_header_sections.qml => tests/unit_x11/tst_components/tst_pagehead_sections.qml
- tests/unit_x11/tst_components/tst_header_visible.qml => tests/unit_x11/tst_components/tst_pagehead_visible.qml
- tests/unit_x11/tst_components/tst_header_with_listview_header.qml => tests/unit_x11/tst_components/tst_pagehead_with_listview_header.qml
- tests/unit_x11/tst_components/tst_pagestack.new_header.qml => tests/unit_x11/tst_components/tst_pagestack.qml
- tests/unit_x11/tst_components/tst_tabs.deprecated_toolbar.qml => tests/unit_x11/tst_components/tst_tabs.DEPRECATED_TOOLBAR.qml
- tests/unit_x11/tst_components/tst_tabs.new_header.qml => tests/unit_x11/tst_components/tst_tabs.qml
- tests/unit_x11/tst_components/tst_tabs_empty.deprecated_toolbar.qml => tests/unit_x11/tst_components/tst_tabs_empty.DEPRECATED_TOOLBAR.qml
- tests/unit_x11/tst_components/tst_tabs_empty.new_header.qml => tests/unit_x11/tst_components/tst_tabs_empty.qml
- tests/unit_x11/tst_components/tst_tabs_with_repeater.deprecated_toolbar.qml => tests/unit_x11/tst_components/tst_tabs_with_repeater.DEPRECATED_TOOLBAR.qml
- tests/unit_x11/tst_components/tst_tabs_with_repeater.new_header.qml => tests/unit_x11/tst_components/tst_tabs_with_repeater.qml
- files modified:
- .bzrignore
added
removed
src/Ubuntu/Components/1.3/Button.qml
