Viewing all changes in revision 1282.
- Committer: Michał Sawicz
- Date: 2016-04-20 17:59:00 UTC
- mfrom: (1280.1.23 ubuntu-ui-toolkit)
- Revision ID: michal.sawicz@canonical.com-20160420175900-6o8ipy7ikjhejhcn
Merge trunk
- files added:
- .bazaar/plugins/packaging_sorting.py
- src/Ubuntu/Components/plugin/privates/shaders
- src/Ubuntu/Components/tools/privates
- src/Ubuntu/UbuntuToolkit
- tests/Gallery
- tests/unit/tst_tree
- tests/unit_x11/tst_asyncloader
- tests/unit_x11/tst_iconprovider/icons/hicolor
- tests/unit_x11/tst_iconprovider/icons/hicolor/apps
- tests/unit_x11/tst_iconprovider/icons/hicolor/apps/512
- tests/unit_x11/tst_iconprovider/icons/mockTheme2
- tests/unit_x11/tst_iconprovider/icons/mockTheme3
- tests/unit_x11/tst_iconprovider/icons/mockTheme3/apps
- tests/unit_x11/tst_iconprovider/icons/mockTheme3/apps/512
- tests/unit_x11/tst_subtheming/themes/BuggyTheme
- tests/unit_x11/tst_subtheming/themes/DerivedTheme
- tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2
- tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3
- files removed:
- examples/calculator/calculator.qmlproject
- files renamed:
- app-launch-profiler/app-launch-profiler-lttng.py => app-launch-profiler/app-launch-profiler-lttng
- app-launch-profiler/appstart_profiling_test_plan.sh => app-launch-profiler/appstart_test
- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install => debian/qml-module-ubuntu-components.install
- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.lintian-overrides => debian/qml-module-ubuntu-components.lintian-overrides
- examples/jokes/laugh.wav => examples/jokes/jokes.wav
- export_modules_dir.sh => export_qml_dir.sh
- src/Ubuntu/Test/UbuntuTestCase.qml => src/Ubuntu/Test/UbuntuTestCase13.qml
- src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp => src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp
- src/Ubuntu/Test/plugin/ucmousetouchadaptor.h => src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h
- examples/ubuntu-ui-toolkit-gallery/Gallery.pro => tests/Gallery/Gallery.pro
- examples/ubuntu-ui-toolkit-gallery/gallery-logging.config => tests/Gallery/gallery-logging.config
- tests/unit_x11/tst_components/tst_datepicker.qml => tests/unit_x11/tst_components/tst_datepicker12.qml.SEGFAULT.bug1567840
- tests/unit_x11/tst_components/tst_datepicker13.qml => tests/unit_x11/tst_components/tst_datepicker13.SEGFAULT.bug1567840
- tests/unit_x11/tst_components/tst_slider.qml => tests/unit_x11/tst_components/tst_slider13.qml
- files modified:
- README
expand all
collapse all
added
removed
examples/calculator/calculator.png
examples/customtheme/customtheme.png
examples/jokes/jokes.png
examples/locale/locale.png
examples/ubuntu-ui-toolkit-gallery/call@30.png
examples/unit-converter/unit-converter.png
tests/unit_x11/tst_iconprovider/icons/hicolor/apps/512/myapp.png
tests/unit_x11/tst_iconprovider/icons/hicolor/apps/512/myapp2.png
tests/unit_x11/tst_iconprovider/icons/mockTheme3/apps/512/myapp.png
