← Back to branch summary

~fboucault/ubuntu-ui-toolkit/fix_tabs_ordering

~fboucault/ubuntu-ui-toolkit/fix_tabs_ordering

Viewing all changes in revision 824.5.4.

Committer: Florian Boucault
Date: 2013-11-22 14:49:12 UTC
mfrom: (848 trunk)
mto: This revision was merged to the branch mainline in revision 858.
Revision ID: florian.boucault@canonical.com-20131122144912-vmv2mi3t9o2rd2dl

Merged trunk

files added:
tests/resources/navigation/TabView.qml

tests/resources/toolbar/LockedToolbar.qml

tests/unit/tst_page

tests/unit/tst_page/AnchorToPage.qml

tests/unit/tst_page/tst_page.cpp

tests/unit/tst_page/tst_page.pro

tests/unit_x11/tst_components/ExternalTab.qml

tests/unit_x11/tst_components/tst_header.qml

tests/unit_x11/tst_components/tst_tabbar.qml

files removed:
examples/ubuntu-ui-toolkit-gallery/po/update-gallery-pot

files modified:
.bzrignore

CHANGES

components.api

debian/changelog

debian/control

documentation/ubuntu-ui-toolkit-online.qdocconf

examples/ubuntu-ui-toolkit-gallery/ListItems.qml

examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop

modules/Ubuntu/Components/Action.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/ListItems/ItemSelector.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/OptionSelector.qml

modules/Ubuntu/Components/OptionSelectorDelegate.qml

modules/Ubuntu/Components/OrientationHelper.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/Tab.qml

modules/Ubuntu/Components/TabBar.qml

modules/Ubuntu/Components/Tabs.qml

modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml

modules/Ubuntu/Components/Toolbar.qml

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/listener.cpp

modules/Ubuntu/Components/plugin/listener.h

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/shapeitem.cpp

modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.h

modules/Ubuntu/Components/plugin/ucstatesaver_p.h

modules/Ubuntu/Components/plugin/uctheme.cpp

po/ca.po

po/de.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/he.po

po/ko.po

po/my.po

po/nl.po

po/oc.po

po/po.pro

po/sv.po

po/update-pot.sh

tests/autopilot/ubuntuuitoolkit/base.py

tests/autopilot/ubuntuuitoolkit/emulators.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py

tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py

tests/qmlapicheck.py

tests/resources/navigation/Tabs.qml

tests/unit/tst_mainview/tst_mainview.cpp

tests/unit/unit.pro

tests/unit_x11/tst_components/tst_listitems_itemselector.qml

tests/unit_x11/tst_components/tst_optionselector.qml

tests/unit_x11/tst_components/tst_tabs.qml

tests/unit_x11/tst_components/tst_toolbar.qml

ubuntu-sdk.pro

Show diffs side-by-side

added added

removed removed

debian/changelog

documentation/ubuntu-ui-toolkit-online.qdocconf

examples/ubuntu-ui-toolkit-gallery/ListItems.qml

examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml

examples/ubuntu-ui-toolkit-gallery/po/update-gallery-pot

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop

modules/Ubuntu/Components/Action.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/ListItems/ItemSelector.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/OptionSelector.qml

modules/Ubuntu/Components/OptionSelectorDelegate.qml

modules/Ubuntu/Components/OrientationHelper.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/Tab.qml

modules/Ubuntu/Components/TabBar.qml

modules/Ubuntu/Components/Tabs.qml

modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/listener.cpp

modules/Ubuntu/Components/plugin/listener.h

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/shapeitem.cpp

modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.cpp

modules/Ubuntu/Components/plugin/ucstatesaver.h

modules/Ubuntu/Components/plugin/ucstatesaver_p.h

modules/Ubuntu/Components/plugin/uctheme.cpp

po/update-pot.sh

tests/autopilot/ubuntuuitoolkit/base.py

tests/autopilot/ubuntuuitoolkit/emulators.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py

tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py

tests/qmlapicheck.py

tests/unit/tst_mainview/tst_mainview.cpp

tests/unit/tst_page/

tests/unit/tst_page/AnchorToPage.qml

tests/unit/tst_page/tst_page.cpp

tests/unit/tst_page/tst_page.pro

tests/unit/unit.pro

tests/unit_x11/tst_components/ExternalTab.qml

tests/unit_x11/tst_components/tst_header.qml

tests/unit_x11/tst_components/tst_listitems_itemselector.qml

tests/unit_x11/tst_components/tst_optionselector.qml

tests/unit_x11/tst_components/tst_tabbar.qml

tests/unit_x11/tst_components/tst_tabs.qml

tests/unit_x11/tst_components/tst_toolbar.qml

Older »