lp:~kalikiana/ubuntu-ui-toolkit/docConditionals

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2013-12-12

Timo Jyrinki: Approve on 2013-12-11

Zsombor Egri: Approve on 2013-12-11

Diff: 246 lines (+58/-28)

8 files modified

components.api (+3/-3)
documentation/ubuntu-ui-toolkit-offline.qdocconf (+5/-5)
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/Popups/Popover.qml (+1/-2)
modules/Ubuntu/Components/TextField.qml (+1/-3)
tests/qmlapicheck.py (+34/-8)
tests/unit/add_qmlmakecheck.pri (+2/-1)
ubuntu-sdk.pro (+11/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1256779: ui-toolkit fails to build documentation with Qt 5.2

Critical

Fix Released

Link a bug report

Related blueprints

883. By Cris Dywan on 2013-12-11

Omit Palette* from qmltypes and cope with prototype declared before name

882. By Cris Dywan on 2013-12-10

Forcibly omit warning: No documentation for "global" with Qt 5.2

881. By Cris Dywan on 2013-12-10

qmlapicheck: collect map of properties and types

This allows dealing with annotations not directly preceding declaration.
No need for dummy internal comments for grouped properties.
Typos of property names become errors.

880. By Cris Dywan on 2013-12-10

Merge lp:ubuntu-ui-toolkit

879. By Cris Dywan on 2013-12-03

Conditionally define doc folder containing resources

878. By Zsombor Egri on 2013-12-02

Layouting fails with Qt5.2 if the tests and components are not rendered upon testing. Layout unit tests have been transferred to X11 unit tests and tests on layout changes all wait till the layout change completes.

Tested with Qt 5.0.2 and Qt 5.2 RC1. Fixes: https://bugs.launchpad.net/bugs/1256235.

Approved by PS Jenkins bot, Florian Boucault.

877. By Timo Jyrinki on 2013-12-02

Require either Qt 5.2 or libqt5v8-5-private-dev.

Approved by PS Jenkins bot, Florian Boucault.

876. By Cris Dywan on 2013-12-02

Accept qmldir files in qmlapicheck and skip internal components. Fixes: https://bugs.launchpad.net/bugs/1256045.

Approved by Florian Boucault, PS Jenkins bot, Tim Peeters.

875. By Albert Astals Cid on 2013-12-02

Make the model a var and not a ListModel

ListModel is bound specifically to QQuickListModel
By using a var we can use other QAbstractItemModel subclasses in the model.

Approved by PS Jenkins bot.

874. By Albert Astals Cid on 2013-12-02

tst_arguments: Do not use QTEST_MAIN

QTEST_MAIN is 99.99% of the times what you want when running a Qt testcase
but it creates a Q*Application and in this case that is not wanted
since we are creating and destroying them as part of the test and Qt
doesn't like when there's more than one Q*Application at the same time,
so do without creating a Q*Application in main. This can of course have
some implications but it seems that for this testcase all is fine. Fixes: https://bugs.launchpad.net/bugs/1254747.

Approved by Zsombor Egri, PS Jenkins bot, Timo Jyrinki.