lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-27
- Get this branch:
- bzr branch lp:~bzoltan/ubuntu-ui-toolkit/OTA12-2016-06-27
Branch merges
- Zoltan Balogh: Needs Fixing
-
Diff: 12585 lines (+3491/-2016) (has conflicts)305 files modified.bazaar/plugins/packaging_sorting.py (+2/-0)
.qmake.conf (+6/-0)
apicheck/apicheck.cpp (+30/-19)
components.api (+136/-135)
debian/bileto_convert_to_gles (+2/-0)
debian/changelog (+68/-0)
debian/control (+33/-0)
debian/control.gles (+34/-0)
debian/gles-disable-documentation.patch (+11/-0)
debian/libubuntugestures5-dev.install (+2/-24)
debian/libubuntugestures5-private-dev.install (+1/-3)
debian/libubuntutoolkit5-dev.install (+2/-10)
debian/qml-module-ubuntu-components-labs.install (+3/-0)
debian/qml-module-ubuntu-components.install (+2/-0)
documentation/overview.qdoc (+12/-12)
documentation/ubuntu-ui-toolkit-common.qdocconf (+8/-1)
export_qml_dir.sh (+1/-1)
features/ubuntu_qml_plugin.prf (+1/-0)
features/ubuntu_qt_module.prf (+1/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+23/-10)
src/Ubuntu/Components/1.3/Icon.qml (+4/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+3/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-0)
src/Ubuntu/Components/Components.pro (+2/-1)
src/Ubuntu/Components/Labs/Labs.pro (+10/-0)
src/Ubuntu/Components/Labs/plugin/plugin.cpp (+47/-0)
src/Ubuntu/Components/Labs/plugin/plugin.pri (+8/-0)
src/Ubuntu/Components/Labs/qmldir (+3/-0)
src/Ubuntu/Components/Styles/Styles.pro (+6/-1)
src/Ubuntu/Components/Styles/plugin/plugin.cpp (+40/-0)
src/Ubuntu/Components/Styles/plugin/plugin.pri (+8/-0)
src/Ubuntu/Components/Styles/qmldir (+2/-0)
src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+4/-2)
src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp (+0/-46)
src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h (+0/-52)
src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h (+0/-24)
src/Ubuntu/Components/plugin/plugin.cpp (+16/-300)
src/Ubuntu/Components/plugin/plugin.h (+4/-17)
src/Ubuntu/Components/plugin/plugin.pri (+4/-199)
src/Ubuntu/Components/plugin/ucnamespace.cpp (+4/-1)
src/Ubuntu/Components/plugin/ucnamespace.h (+5/-5)
src/Ubuntu/Components/qmldir (+1/-0)
src/Ubuntu/Test/plugin/plugin.pri (+1/-1)
src/Ubuntu/Test/plugin/testplugin.cpp (+4/-2)
src/Ubuntu/Test/plugin/uctestextras.cpp (+10/-7)
src/Ubuntu/UbuntuGestures/UbuntuGestures.pro (+11/-9)
src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp (+3/-3)
src/Ubuntu/UbuntuGestures/candidateinactivitytimer_p.h (+3/-3)
src/Ubuntu/UbuntuGestures/debughelpers.cpp (+1/-1)
src/Ubuntu/UbuntuGestures/timer.cpp (+4/-4)
src/Ubuntu/UbuntuGestures/timer_p.h (+3/-3)
src/Ubuntu/UbuntuGestures/timesource.cpp (+6/-6)
src/Ubuntu/UbuntuGestures/timesource_p.h (+2/-2)
src/Ubuntu/UbuntuGestures/touchownershipevent.cpp (+5/-1)
src/Ubuntu/UbuntuGestures/touchownershipevent_p.h (+3/-0)
src/Ubuntu/UbuntuGestures/touchregistry.cpp (+9/-7)
src/Ubuntu/UbuntuGestures/touchregistry_p.h (+12/-9)
src/Ubuntu/UbuntuGestures/ubuntugesturesglobal.h (+24/-0)
src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp (+36/-0)
src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h (+35/-0)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+8/-6)
src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+6/-4)
src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+10/-6)
src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp (+5/-1)
src/Ubuntu/UbuntuGestures/unownedtouchevent_p.h (+3/-0)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+214/-7)
src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h (+5/-1)
src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h (+8/-2)
src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp (+4/-4)
src/Ubuntu/UbuntuToolkit/alarmmanager_p.h (+6/-2)
src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h (+5/-2)
src/Ubuntu/UbuntuToolkit/asyncloader.cpp (+3/-3)
src/Ubuntu/UbuntuToolkit/asyncloader_p.h (+2/-2)
src/Ubuntu/UbuntuToolkit/asyncloader_p_p.h (+5/-4)
src/Ubuntu/UbuntuToolkit/colorutils.cpp (+3/-3)
src/Ubuntu/UbuntuToolkit/colorutils_p.h (+2/-2)
src/Ubuntu/UbuntuToolkit/filterbehavior.cpp (+4/-1)
src/Ubuntu/UbuntuToolkit/filterbehavior_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/i18n.cpp (+9/-5)
src/Ubuntu/UbuntuToolkit/i18n_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp (+6/-3)
src/Ubuntu/UbuntuToolkit/inversemouseareatype_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/label_p.h (+5/-2)
src/Ubuntu/UbuntuToolkit/listener.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/listener_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/livetimer.cpp (+5/-3)
src/Ubuntu/UbuntuToolkit/livetimer_p.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/livetimer_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/livetimer_p_p.h (+5/-1)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp (+4/-4)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h (+2/-2)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p_p.h (+3/-3)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp (+14/-14)
src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/privates/appheaderbase_p.h (+14/-3)
src/Ubuntu/UbuntuToolkit/privates/frame.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/privates/frame_p.h (+5/-2)
src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp (+9/-6)
src/Ubuntu/UbuntuToolkit/privates/listitemdragarea_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp (+8/-5)
src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler_p.h (+5/-2)
src/Ubuntu/UbuntuToolkit/privates/listitemexpansion.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/privates/listitemselection_p.h (+5/-0)
src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp (+7/-3)
src/Ubuntu/UbuntuToolkit/privates/listviewextensions_p.h (+6/-0)
src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp (+7/-3)
src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h (+10/-0)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp (+6/-3)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp (+4/-0)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h (+5/-0)
src/Ubuntu/UbuntuToolkit/propertychange.cpp (+3/-3)
src/Ubuntu/UbuntuToolkit/propertychange_p.h (+2/-2)
src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp (+20/-12)
src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h (+13/-4)
src/Ubuntu/UbuntuToolkit/qquickclipboard_p_p.h (+9/-4)
src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/qquickmimedata_p.h (+7/-3)
src/Ubuntu/UbuntuToolkit/quickutils.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/quickutils_p.h (+16/-1)
src/Ubuntu/UbuntuToolkit/sortbehavior.cpp (+4/-1)
src/Ubuntu/UbuntuToolkit/sortbehavior_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp (+4/-4)
src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h (+11/-2)
src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp (+6/-4)
src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/timeutils_p.h (+5/-1)
src/Ubuntu/UbuntuToolkit/tree.cpp (+3/-4)
src/Ubuntu/UbuntuToolkit/tree_p.h (+2/-2)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h (+28/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+372/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h (+89/-0)
src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp (+9/-6)
src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h (+13/-4)
src/Ubuntu/UbuntuToolkit/ucabstractbutton_p_p.h (+6/-3)
src/Ubuntu/UbuntuToolkit/ucaction.cpp (+8/-4)
src/Ubuntu/UbuntuToolkit/ucaction_p.h (+11/-4)
src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/ucactioncontext_p.h (+15/-9)
src/Ubuntu/UbuntuToolkit/ucactionitem.cpp (+8/-5)
src/Ubuntu/UbuntuToolkit/ucactionitem_p.h (+10/-2)
src/Ubuntu/UbuntuToolkit/ucactionitem_p_p.h (+6/-2)
src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp (+7/-3)
src/Ubuntu/UbuntuToolkit/ucactionmanager_p.h (+13/-8)
src/Ubuntu/UbuntuToolkit/ucalarm.cpp (+8/-5)
src/Ubuntu/UbuntuToolkit/ucalarm_p.h (+7/-3)
src/Ubuntu/UbuntuToolkit/ucalarm_p_p.h (+7/-3)
src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp (+7/-4)
src/Ubuntu/UbuntuToolkit/ucalarmmodel_p.h (+7/-3)
src/Ubuntu/UbuntuToolkit/ucapplication.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/ucapplication_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/ucargument.cpp (+4/-2)
src/Ubuntu/UbuntuToolkit/ucargument_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucarguments.cpp (+6/-3)
src/Ubuntu/UbuntuToolkit/ucarguments_p.h (+8/-4)
src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp (+14/-15)
src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h (+17/-11)
src/Ubuntu/UbuntuToolkit/ucbottomedge_p_p.h (+9/-9)
src/Ubuntu/UbuntuToolkit/ucbottomedgehint.cpp (+14/-13)
src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h (+14/-4)
src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p_p.h (+13/-7)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp (+12/-9)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h (+8/-3)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p_p.h (+7/-6)
src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/ucbottomedgestyle_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/ucdefaulttheme.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/ucdefaulttheme_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp (+8/-5)
src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme_p.h (+8/-2)
src/Ubuntu/UbuntuToolkit/ucfontutils.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/ucfontutils_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/uchaptics.cpp (+8/-4)
src/Ubuntu/UbuntuToolkit/uchaptics_p.h (+9/-4)
src/Ubuntu/UbuntuToolkit/ucheader.cpp (+20/-3)
src/Ubuntu/UbuntuToolkit/ucheader_p.h (+11/-4)
src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.cpp (+4/-1)
src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucinversemouse_p.h (+11/-5)
src/Ubuntu/UbuntuToolkit/uclabel.cpp (+8/-5)
src/Ubuntu/UbuntuToolkit/uclabel_p.h (+9/-4)
src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+20/-20)
src/Ubuntu/UbuntuToolkit/uclistitem_p.h (+32/-9)
src/Ubuntu/UbuntuToolkit/uclistitem_p_p.h (+8/-3)
src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp (+10/-10)
src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h (+8/-3)
src/Ubuntu/UbuntuToolkit/uclistitemactions_p_p.h (+5/-1)
src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/uclistitemlayout_p.h (+13/-2)
src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp (+7/-3)
src/Ubuntu/UbuntuToolkit/uclistitemstyle_p.h (+14/-8)
src/Ubuntu/UbuntuToolkit/ucmainviewbase.cpp (+16/-13)
src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h (+17/-2)
src/Ubuntu/UbuntuToolkit/ucmainviewbase_p_p.h (+6/-2)
src/Ubuntu/UbuntuToolkit/ucmargins_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucmathutils.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/ucmathutils_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/ucmouse_p.h (+13/-6)
src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp (+10/-11)
src/Ubuntu/UbuntuToolkit/ucpagetreenode.cpp (+6/-3)
src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h (+14/-2)
src/Ubuntu/UbuntuToolkit/ucpagetreenode_p_p.h (+6/-2)
src/Ubuntu/UbuntuToolkit/ucperformancemonitor.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/ucperformancemonitor_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucproportionalshape.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/ucproportionalshape_p.h (+8/-4)
src/Ubuntu/UbuntuToolkit/ucqquickimageextension.cpp (+7/-3)
src/Ubuntu/UbuntuToolkit/ucqquickimageextension_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/ucscalingimageprovider_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp (+5/-4)
src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h (+6/-1)
src/Ubuntu/UbuntuToolkit/ucserviceproperties_p_p.h (+6/-2)
src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp (+8/-4)
src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h (+22/-4)
src/Ubuntu/UbuntuToolkit/ucslotslayout_p_p.h (+5/-1)
src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp (+19/-10)
src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h (+8/-4)
src/Ubuntu/UbuntuToolkit/ucstatesaver_p_p.h (+10/-5)
src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp (+11/-9)
src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h (+9/-4)
src/Ubuntu/UbuntuToolkit/ucstyleditembase_p_p.h (+9/-4)
src/Ubuntu/UbuntuToolkit/ucstylehints.cpp (+7/-6)
src/Ubuntu/UbuntuToolkit/ucstylehints_p.h (+10/-7)
src/Ubuntu/UbuntuToolkit/uctheme.cpp (+12/-8)
src/Ubuntu/UbuntuToolkit/uctheme_p.h (+12/-4)
src/Ubuntu/UbuntuToolkit/ucthemingextension.cpp (+6/-2)
src/Ubuntu/UbuntuToolkit/ucthemingextension_p.h (+8/-2)
src/Ubuntu/UbuntuToolkit/ucubuntuanimation.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/ucubuntuanimation_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp (+85/-93)
src/Ubuntu/UbuntuToolkit/ucubuntushape_p.h (+13/-4)
src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay_p.h (+7/-3)
src/Ubuntu/UbuntuToolkit/ucubuntushapetextures.cpp (+5/-11)
src/Ubuntu/UbuntuToolkit/ucubuntushapetextures_p.h (+21/-0)
src/Ubuntu/UbuntuToolkit/ucunits.cpp (+5/-2)
src/Ubuntu/UbuntuToolkit/ucunits_p.h (+7/-1)
src/Ubuntu/UbuntuToolkit/ucurihandler.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/ucurihandler_p.h (+12/-3)
src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp (+13/-10)
src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.cpp (+5/-1)
src/Ubuntu/UbuntuToolkit/unitythemeiconprovider_p.h (+7/-2)
src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.cpp (+4/-0)
src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h (+6/-0)
src/src.pro (+1/-1)
sync.profile (+3/-5)
tests/api/components.api (+6/-6)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py (+2/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+2/-1)
tests/checkresults.sh (+12/-13)
tests/unit/alarms/tst_alarms.cpp (+9/-7)
tests/unit/animator/tst_animator.cpp (+3/-1)
tests/unit/argument/tst_argument.cpp (+3/-1)
tests/unit/arguments/tst_arguments.cpp (+4/-2)
tests/unit/asyncloader/tst_asyncloader.cpp (+42/-40)
tests/unit/bottomedge/tst_bottomedge.cpp (+15/-13)
tests/unit/custom_qpa/main.cpp (+1/-1)
tests/unit/deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+6/-4)
tests/unit/i18n/LocalizedApp/src/tst_i18n_LocalizedApp.cpp (+7/-5)
tests/unit/i18n/RelativeTime/src/tst_i18n_RelativeTime.cpp (+7/-5)
tests/unit/iconprovider/tst_iconprovider.cpp (+3/-1)
tests/unit/inversemousearea/tst_inversemouseareatest.cpp (+3/-2)
tests/unit/layouts/tst_layouts.cpp (+4/-2)
tests/unit/mainview/tst_mainview.cpp (+6/-4)
tests/unit/mousefilters/tst_mousefilterstest.cpp (+10/-8)
tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp (+5/-3)
tests/unit/quickutils/tst_quickutils.cpp (+3/-1)
tests/unit/scaling_image_provider/tst_scaling_image_provider.cpp (+3/-1)
tests/unit/serviceproperties/tst_serviceproperties.cpp (+4/-2)
tests/unit/statesaver/tst_statesaver.cpp (+8/-6)
tests/unit/subtheming/tst_subtheming.cpp (+15/-9)
tests/unit/swipearea/GestureTest.cpp (+3/-3)
tests/unit/swipearea/GestureTest.h (+4/-5)
tests/unit/swipearea/tst_swipearea.cpp (+103/-103)
tests/unit/test-include-x11.pri (+1/-1)
tests/unit/test-include.pri (+1/-1)
tests/unit/touchregistry/tst_TouchRegistry.cpp (+8/-6)
tests/unit/tree/tst_tree.cpp (+18/-16)
tests/unit/units/dpr1/tst_units.cpp (+3/-7)
tests/unit/units/dpr2/tst_units_dpr2.cpp (+3/-1)
tests/unit/units/dpr3/tst_units_dpr3.cpp (+3/-1)
tests/unit/units/scale/tst_units_scale.cpp (+3/-1)
tests/unit/visual/gallery.qml (+1/-1)
tests/unit/visual/naming.sh (+31/-0)
tests/unit/visual/tst_adaptivepagelayout.13.qml (+3/-2)
tests/unit/visual/tst_listitem.12.qml (+1/-1)
tests/unit/visual/tst_listitem_selectmode.12.qml (+1/-1)
tests/unit/visual/tst_multicolumnheader.13.qml (+119/-43)
tests/unit/visual/tst_scrollbar.13.qml (+1/-1)
tests/unit/visual/tst_scrollbar_header.13.qml (+1/-1)
tests/unit/visual/tst_scrollview.13.qml (+1/-1)
tests/unit/visual/tst_textinput_common.12.qml (+1/-1)
tests/unit/visual/visual.pro (+2/-0)
ubuntu-sdk.pro (+1/-0)
ubuntu-ui-toolkit-launcher/launcher.cpp (+2/-2)
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+1/-1)
Branch information
Recent revisions
- 2043. By Cris Dywan
-
Enter/Return to trigger, Space to expand ComboButton. Fixes: https:/
/bugs.launchpad .net/bugs/ 1523817. Approved by ubuntu-
sdk-build- bot, Tim Peeters. - 2042. By Andrea Bernabei
-
ListItemLayout doc: add explicit note about the need to bind ListItem's height to layout's height.
Approved by ubuntu-
sdk-build- bot, Christian Dywan. - 2041. By Timo Jyrinki
-
Disable documentation building for GLES builds. Fixes: https:/
/bugs.launchpad .net/bugs/ 1606222. Approved by ubuntu-
sdk-build- bot. - 2040. By Andrea Bernabei
-
ListItemLayout doc: add elide mode change example and add section about labels default properties values. Fixes: https:/
/bugs.launchpad .net/bugs/ 1603450. Approved by ubuntu-
sdk-build- bot, Christian Dywan, Jonas G. Drange. - 2039. By Zsombor Egri
-
Fix null pointer property initializer used with 1.3 PageWrapper. Fixes: https:/
/bugs.launchpad .net/bugs/ 1604780. Approved by ubuntu-
sdk-build- bot, Christian Dywan. - 2038. By Albert Astals Cid
-
UCUnits:
:resolveResourc e: Prefer image path if it exists This saves searching the disk for @gu images, which is a big speedup
According to callgrind loading 100 images from a folder that contains 380 images goes from
around 3 million instructions per UCUnits::resolveResourc e call down to around 10 thousand This optimization is ok since it is not correct to ship both
image.png
and
image@ 20.png
you either have to ship gu-enabled files or not, but mixing them is not allowed.Searched for cases in which that may be happening in my phone and found none. Fixes: https:/
/bugs.launchpad .net/bugs/ 1604029. Approved by ubuntu-
sdk-build- bot, Christian Dywan, Andrea Bernabei.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-ui-toolkit