Merge lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii into lp://qastaging/u1db-qt
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 63 |
Merged at revision: | 61 |
Proposed branch: | lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii |
Merge into: | lp://qastaging/u1db-qt |
Diff against target: |
363 lines (+210/-16) 6 files modified
database.cpp (+5/-0) database.h (+3/-0) index.cpp (+157/-1) index.h (+9/-0) query.cpp (+35/-14) query.h (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Created initial index functionality. Modified source for both Index and Query. Within the Index source, QVariantMaps are generated (based on the index expressions), using appropriate data, and put into a QList, which is used by Query::data as its return value. Some known issues: currently will match on any index expression criteria (rather than on all criteria), and will not recognize new databases / documents (but has no problems with existing ones).
Also, fixed index.h and query.h by adding back in some important ifdef Q_DOC conditions that were overwritten. Additionally added back in one qdoc 'inmodule' markup line that was accidently erased in query.cpp.
Description of the change
Created initial index functionality. Modified source for both Index and Query. Within the Index source, QVariantMaps are generated (based on the index expressions), using appropriate data, and put into a QList, which is used by Query::data as its return value. Some known issues: currently will match on any index expression criteria (rather than on all criteria), and will not recognize new databases / documents (but has no problems with existing ones).
Also, fixed index.h and query.h by adding back in some important ifdef Q_DOC conditions that were overwritten. Additionally added back in one qdoc 'inmodule' markup line that was accidently erased in query.cpp.
PASSED: Continuous integration, rev:62 91.189. 93.125: 8080/job/ u1db-qt- ci/19/ 91.189. 93.125: 8080/job/ u1db-qt- quantal- amd64-ci/ 19 91.189. 93.125: 8080/job/ u1db-qt- raring- amd64-ci/ 19
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.125: 8080/job/ u1db-qt- ci/19/rebuild
http://