lp:~bzoltan/ubuntu-ui-toolkit/landing-1010

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit at revision 1115

Ubuntu SDK team: Pending requested 2014-10-10

Diff: 2311 lines (+740/-538)

39 files modified

debian/changelog (+82/-0)
debian/control (+0/-1)
examples/ubuntu-ui-toolkit-gallery/Icons.qml (+3/-2)
examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/TextInputs.qml (+12/-0)
modules/Ubuntu/Components/Icon10.qml (+15/-33)
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/OrientationHelper.qml (+4/-1)
modules/Ubuntu/Components/Popups/Dialog.qml (+40/-37)
modules/Ubuntu/Components/TextArea.qml (+2/-0)
modules/Ubuntu/Components/TextCursor.qml (+1/-0)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+1/-0)
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+1/-0)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+1/-0)
modules/Ubuntu/Components/ToolbarItems.qml (+1/-1)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+35/-50)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+2/-1)
modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+5/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+20/-18)
modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+2/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+0/-7)
modules/Ubuntu/Components/plugin/plugin.pro (+1/-3)
modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp (+0/-87)
modules/Ubuntu/Components/plugin/thumbnailgenerator.h (+0/-36)
modules/Ubuntu/Components/plugin/ucactioncontext.h (+1/-0)
modules/Ubuntu/Components/plugin/ucactionmanager.h (+1/-0)
modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+1/-1)
modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.cpp (+123/-66)
modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.h (+4/-37)
modules/Ubuntu/Test/UbuntuTestCase.qml (+23/-22)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+51/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml (+70/-0)
tests/qmlapicheck.py (+3/-1)
tests/qmlapicheck.sh (+14/-5)
tests/uitk_test_plan.sh (+153/-88)
tests/unit/add_qmlmakecheck.pri (+1/-1)
tests/unit/tst_alarms/tst_alarms.cpp (+54/-37)
tests/unit/tst_i18n/src/LocalizedApp.qml (+1/-1)
tests/unit_x11/tst_components/tst_textarea.qml (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1291. By Zoltan Balogh on 2014-10-16

Fix qmlapicheck

1290. By Zoltan Balogh on 2014-10-16

Sync from landing branch

1289. By Zoltan Balogh on 2014-10-16

Sync from staging

1288. By Zoltan Balogh on 2014-10-10

Landing 10/10/14

1287. By Zoltan Balogh on 2014-10-10

Sync from trunk

1286. By Renato Araujo Oliveira Filho on 2014-10-09

Save alarms in invalid time zone.

Use invalid time zone to floating time alarms.

Approved by PS Jenkins bot, Nekhelesh Ramananthan, Zsombor Egri.

1285. By Tim Peeters on 2014-10-08

Make icons from theme in showcase gallery scrollable. Fixes: https://bugs.launchpad.net/bugs/1336279.

Approved by PS Jenkins bot, Zsombor Egri.

1284. By Sebastien Bacher on 2014-10-08

don't use simple quotes around translatable strings, xgetting ignore those. Fixes: https://bugs.launchpad.net/bugs/1378774.

Approved by PS Jenkins bot, Christian Dywan.

1283. By Zsombor Egri on 2014-10-08

Alarm update regression caused by EDS changes. Also fixes Tags update. Requires qtorganizer5-eds updates as well!. Fixes: https://bugs.launchpad.net/bugs/1364949.

Approved by PS Jenkins bot, Christian Dywan.

1282. By Cris Dywan on 2014-10-08

Make dialog contents scrollable. Fixes: https://bugs.launchpad.net/bugs/1376763.

Approved by PS Jenkins bot, Zsombor Egri.