lp://qastaging/~kalikiana/dee-qt/deevarianttext

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp://qastaging/dee-qt

Albert Astals Cid (community): Needs Fixing on 2013-04-02

Cris Dywan (community): Abstain on 2013-03-28

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2013-03-14

Michał Sawicz: Pending requested 2013-03-14

Diff: 1021 lines (+608/-48) (has conflicts)

18 files modified

.bzrignore (+15/-2)
CMakeLists.txt (+12/-1)
deelistmodel.cpp (+70/-13)
deelistmodel.h (+7/-2)
deeprivate.h (+23/-0)
deevarianttext.cpp (+72/-0)
deevarianttext.h (+49/-0)
modules/Dee/CMakeLists.txt (+7/-1)
modules/Dee/plugin.cpp (+2/-0)
tests/CMakeLists.txt (+29/-1)
tests/conversiontest.cpp (+1/-0)
tests/deelistmodeltest.cpp (+40/-2)
tests/deevarianttexttest.cpp (+58/-0)
tests/qtquick1plugintest.cpp (+48/-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

Superseded for merging into lp://qastaging/dee-qt/0.2

Michał Sawicz: Needs Fixing on 2012-12-05

Diff: 995 lines (+586/-58)

18 files modified

.bzrignore (+15/-2)
CMakeLists.txt (+9/-2)
deelistmodel.cpp (+55/-22)
deelistmodel.h (+7/-2)
deeprivate.h (+23/-0)
deevarianttext.cpp (+72/-0)
deevarianttext.h (+49/-0)
modules/Dee/CMakeLists.txt (+3/-1)
modules/Dee/plugin.cpp (+2/-0)
tests/CMakeLists.txt (+29/-1)
tests/conversiontest.cpp (+1/-0)
tests/deelistmodeltest.cpp (+40/-2)
tests/deevarianttexttest.cpp (+58/-0)
tests/qtquick1plugintest.cpp (+48/-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

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.

101. By Cris Dywan on 2013-01-17

Use QSignalSpy instead of manual callbacks to verify signals

100. By Cris Dywan on 2012-12-06

Fixup insertRemoveTest

99. By Cris Dywan on 2012-12-06

Add insertRemoveTest (needs improvement)

98. By Cris Dywan on 2012-12-06

Fix running deevarianttexttest