Merge lp://staging/~boiko/history-service/rtm-fix_group_thread_matching into lp://staging/history-service/rtm-14.09
| Status: | Merged |
|---|---|
| Approved by: | Tiago Salem Herrmann |
| Approved revision: | 173 |
| Merged at revision: | 173 |
| Proposed branch: | lp://staging/~boiko/history-service/rtm-fix_group_thread_matching |
| Merge into: | lp://staging/history-service/rtm-14.09 |
| Diff against target: |
397 lines (+159/-51) 6 files modified
plugins/sqlite/sqlitehistoryeventview.cpp (+14/-2) plugins/sqlite/sqlitehistoryplugin.cpp (+6/-22) plugins/sqlite/sqlitehistoryplugin.h (+1/-1) plugins/sqlite/sqlitehistorythreadview.cpp (+14/-2) plugins/sqlite/tests/SqlitePluginTest.cpp (+31/-13) src/tests/EventViewTest.cpp (+93/-11) |
| To merge this branch: | bzr merge lp://staging/~boiko/history-service/rtm-fix_group_thread_matching |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tiago Salem Herrmann (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Use QSqlQuery:
Description of the change
Use QSqlQuery:
== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes
Did you successfully run all tests found in your component's Test Plan (https:/
Yes
If you changed the UI, was the change specified/approved by design?
N/A
If you changed UI labels, did you update the pot file?
N/A
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A
Looks good.
--Checklist--
Did you perform an exploratory manual test run of the code change and any related functionality on
device or emulator?
Yes
Did CI run pass? If not, please explain why.
No, it does not run for rtm branches.
Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes