Merge lp://qastaging/~kalikiana/dee-qt/deevarianttext into lp://qastaging/dee-qt/0.2
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~kalikiana/dee-qt/deevarianttext |
| Merge into: | lp://qastaging/dee-qt/0.2 |
| Prerequisite: | lp://qastaging/~saviq/dee-qt/rename-libs |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://qastaging/~kalikiana/dee-qt/deevarianttext |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Needs Fixing | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-12-04.
This proposal has been superseded by a proposal from 2013-03-14.
Unmerged revisions
- 107. By Cris Dywan
-
Drop remaining pieces of delegate approach as well
- 106. By Cris Dywan
-
Drop delegate test, the approach is wrong
- 105. By Cris Dywan
-
Use QT_INSTALL_QML (QtQuick2) instead of QT_INSTALL_IMPORTS (QtQuick1)
See http://
doc-snapshot. qt-project. org/5.0/ qtcore/ qlibraryinfo. html#LibraryLoc ation-enum - 104. By Cris Dywan
-
Use SignalSpy in QML - preliminary text delegate testing
- 103. By Cris Dywan
-
Emit layoutChanged in addition to countChanged
- 102. By Cris Dywan
-
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
-
Use QSignalSpy instead of manual callbacks to verify signals
- 100. By Cris Dywan
-
Fixup insertRemoveTest
- 99. By Cris Dywan
-
Add insertRemoveTest (needs improvement)
- 98. By Cris Dywan
-
Fix running deevarianttexttest
Your changes to DeeListModel broke it for our use (rolesChanged isn't fired anymore).