← Back to branch summary

~kalikiana/ubuntu-ui-toolkit/appsettings

~kalikiana/ubuntu-ui-toolkit/appsettings

Viewing all changes in revision 776.

Committer: Christian Dywan
Date: 2014-06-20 07:43:24 UTC
mfrom: (700.207.178 staging)
Revision ID: christian.dywan@canonical.com-20140620074324-wd52c76zb4j07531

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

files added:
push_to_phone.sh

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py

tests/launcher/MouseTouchAdaptor.cpp

tests/launcher/MouseTouchAdaptor.h

files renamed:
tests/unit/tst_components/tst_page.qml => tests/unit_x11/tst_components/tst_page.qml

tests/unit/tst_components/tst_quickutils.qml => tests/unit_x11/tst_components/tst_quickutils.qml

tests/unit/tst_components/tst_toolbaritems.qml => tests/unit_x11/tst_components/tst_toolbaritems.qml

tests/unit/tst_page/ => tests/unit_x11/tst_page/

tests/unit/tst_ubuntu_shape/ => tests/unit_x11/tst_ubuntu_shape/

files modified:
debian/changelog

debian/ubuntu-ui-toolkit-autopilot.install

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

modules/Ubuntu/Components/Icon.qml

modules/Ubuntu/Components/Label.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/OrientationHelper.qml

modules/Ubuntu/Components/Popups/ComposerSheet.qml

modules/Ubuntu/Components/Popups/DefaultSheet.qml

modules/Ubuntu/Components/Popups/SheetBase.qml

modules/Ubuntu/Components/Scrollbar.qml

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

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

modules/Ubuntu/Components/Toolbar.qml

modules/Ubuntu/Components/plugin/filterbehavior.cpp

modules/Ubuntu/Components/plugin/filterbehavior.h

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.h

modules/Ubuntu/Components/plugin/sortbehavior.cpp

modules/Ubuntu/Components/plugin/sortbehavior.h

modules/Ubuntu/Components/plugin/uctheme.cpp

modules/Ubuntu/Test/plugin/plugin.pro

modules/Ubuntu/Test/plugin/uctestcase.cpp

modules/Ubuntu/Test/plugin/uctestcase.h

po/ca.po

po/de.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/he.po

po/hu.po

po/ko.po

po/my.po

po/nl.po

po/oc.po

po/pt_BR.po

po/sv.po

po/uk.po

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py

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

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

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py

tests/launcher/launcher.cpp

tests/launcher/launcher.pro

tests/unit/runtest.sh

tests/unit/tst_components/tst_label.qml

tests/unit/unit.pro

tests/unit_x11/tst_components/tst_hide_chrome.qml

tests/unit_x11/tst_components/tst_popover.qml

tests/unit_x11/tst_components/tst_textarea.qml

tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml

tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp

tests/unit_x11/unit_x11.pro

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/ubuntu-ui-toolkit-autopilot.install

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

modules/Ubuntu/Components/Icon.qml

modules/Ubuntu/Components/Label.qml

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/OrientationHelper.qml

modules/Ubuntu/Components/Popups/ComposerSheet.qml

modules/Ubuntu/Components/Popups/DefaultSheet.qml

modules/Ubuntu/Components/Popups/SheetBase.qml

modules/Ubuntu/Components/Scrollbar.qml

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

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

modules/Ubuntu/Components/plugin/filterbehavior.cpp

modules/Ubuntu/Components/plugin/filterbehavior.h

modules/Ubuntu/Components/plugin/inversemouseareatype.cpp

modules/Ubuntu/Components/plugin/inversemouseareatype.h

modules/Ubuntu/Components/plugin/sortbehavior.cpp

modules/Ubuntu/Components/plugin/sortbehavior.h

modules/Ubuntu/Components/plugin/uctheme.cpp

modules/Ubuntu/Test/plugin/plugin.pro

modules/Ubuntu/Test/plugin/uctestcase.cpp

modules/Ubuntu/Test/plugin/uctestcase.h

push_to_phone.sh

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py

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

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py

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

tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py

tests/launcher/MouseTouchAdaptor.cpp

tests/launcher/MouseTouchAdaptor.h

tests/launcher/launcher.cpp

tests/launcher/launcher.pro

tests/unit/runtest.sh

tests/unit/tst_components/tst_label.qml

tests/unit/unit.pro

tests/unit_x11/tst_components/tst_hide_chrome.qml

tests/unit_x11/tst_components/tst_popover.qml

tests/unit_x11/tst_components/tst_textarea.qml

tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml

tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp

tests/unit_x11/unit_x11.pro

Older »