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/~unity-team/dee-qt/qt4-and-qt5 |
Diff against target: |
1252 lines (+589/-260) 29 files modified
.bzrignore (+16/-3) CMakeLists.txt (+30/-90) debian/changelog (+13/-0) debian/control (+9/-7) debian/libdee-qt-3.install (+3/-3) debian/libdee-qt-dev.install (+3/-3) debian/libdee-qt5-3.install (+3/-3) debian/libdee-qt5-dev.install (+3/-3) deelistmodel.cpp (+19/-21) deelistmodel.h (+3/-2) deeprivate.h (+23/-0) deevarianttext.cpp (+72/-0) deevarianttext.h (+49/-0) libdee-qt.pc.in (+5/-5) modules/CMakeLists.txt (+1/-0) modules/Dee/CMakeLists.txt (+46/-0) modules/Dee/plugin.cpp (+5/-3) modules/Dee/plugin.h (+1/-1) modules/Dee/qmldir (+1/-1) test.cpp (+0/-35) test.h (+0/-52) test_qtquick2.qml (+0/-15) tests/CMakeLists.txt (+57/-0) tests/conversiontest.cpp (+1/-0) tests/deevarianttexttest.cpp (+58/-0) tests/qtquick1plugintest.cpp (+48/-0) tests/test_qtquick1.qml (+38/-13) tests/tst_deelistmodel.qml (+22/-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 | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2012-12-04.
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