lp://staging/~unity-team/dee-qt/deevarianttext-and-tests

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/dee-qt

Albert Astals Cid (community): Disapprove on 2013-12-02

PS Jenkins bot (community): Approve (continuous-integration) on 2013-03-15

Michał Sawicz: Pending requested 2013-03-15

Diff: 989 lines (+582/-44)

22 files modified

.bzrignore (+16/-3)
CMakeLists.txt (+3/-1)
debian/changelog (+8/-0)
debian/control (+3/-0)
debian/rules (+0/-2)
deelistmodel.cpp (+40/-8)
deelistmodel.h (+6/-1)
deeprivate.h (+23/-0)
deevarianttext.cpp (+72/-0)
deevarianttext.h (+49/-0)
modules/Dee/CMakeLists.txt (+2/-0)
modules/Dee/plugin.cpp (+2/-0)
tests/CMakeLists.txt (+30/-1)
tests/conversiontest.cpp (+3/-0)
tests/deelistmodeltest.cpp (+40/-2)
tests/deevarianttexttest.cpp (+60/-0)
tests/qtquick1plugintest.cpp (+48/-0)
tests/test-helper.cpp (+2/-0)
tests/test_qtquick1.qml (+36/-11)
tests/test_qtquick2.qml (+0/-15)
tests/tst_deelistmodel.qml (+79/-0)
tests/tst_deevarianttext.qml (+60/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

111. By Michał Sawicz on 2013-03-15

add changelog entry

110. By Michał Sawicz on 2013-03-15

disable tests during build, add test dependencies to Build-Dep

109. By Michał Sawicz on 2013-03-15

merge trunk

108. By Michał Sawicz on 2013-03-15

fix build on raring and drop deprecated g_type_init calls

107. By Cris Dywan on 2013-03-08

Drop remaining pieces of delegate approach as well

106. By Cris Dywan on 2013-03-08

Drop delegate test, the approach is wrong

105. By Cris Dywan on 2013-01-23

Use QT_INSTALL_QML (QtQuick2) instead of QT_INSTALL_IMPORTS (QtQuick1)

See http://doc-snapshot.qt-project.org/5.0/qtcore/qlibraryinfo.html#LibraryLocation-enum

104. By Cris Dywan on 2013-01-23

Use SignalSpy in QML - preliminary text delegate testing

103. By Cris Dywan on 2013-01-17

Emit layoutChanged in addition to countChanged

102. By Cris Dywan on 2013-01-17

Expose append/ remove to QML to allow hosting new models

For now only in test models and no API to set the schema.