U1DB Qt/ QML

Merge lp://qastaging/~kevin-wright-1/u1db-qt/query-april-19-2013-i into lp://qastaging/u1db-qt

Proposed by Kevin Wright on 2013-04-19

Status:	Merged
Approved by:	Cris Dywan on 2013-04-19
Approved revision:	76
Merged at revision:	72
Proposed branch:	lp://qastaging/~kevin-wright-1/u1db-qt/query-april-19-2013-i
Merge into:	lp://qastaging/u1db-qt
Diff against target:	212 lines (+161/-5) 3 files modified examples/u1db-qt-example-5/u1db-qt-example-5.qml (+1/-1) src/query.cpp (+153/-4) src/query.h (+7/-0)
To merge this branch:	bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/query-april-19-2013-i
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Cris Dywan		2013-04-19	Approve on 2013-04-19
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-04-19
Review via email: mp+159796@code.qastaging.launchpad.net

Added support for 'Query' to use string, list or map. Removed 'queries' property.

Added support for 'Query' to use string, list or map. Removed 'queries' property.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2013-04-19:

review: Approve (continuous-integration)

76. By Kevin Wright on 2013-04-19: Fixed u1db-qt-example-5.qml -- an incorrect modification was accidently pushed, where a query was designed to not return anything (which is fine for testing but not desireable for the example suite).