lp://staging/~stolowski/unity-scopes-api/canned-query-data

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/unity-scopes-api/devel at revision 563

PS Jenkins bot (community): Approve (continuous-integration) on 2015-03-02

Michi Henning (community): Approve on 2015-03-02

Diff: 817 lines (+339/-16)

23 files modified

RELEASE_NOTES.md (+1/-0)
STRUCTS (+8/-0)
debian/changelog (+2/-1)
debian/libunity-scopes-qt.symbols (+2/-0)
debian/libunity-scopes3.symbols (+6/-1)
include/unity/scopes/CannedQuery.h (+27/-1)
include/unity/scopes/Scope.h (+20/-0)
include/unity/scopes/SearchQueryBase.h (+7/-0)
include/unity/scopes/internal/CannedQueryImpl.h (+6/-2)
include/unity/scopes/internal/ScopeImpl.h (+8/-0)
include/unity/scopes/internal/SearchQueryBaseImpl.h (+1/-0)
include/unity/scopes/qt/QCannedQuery.h (+15/-0)
include/unity/scopes/qt/internal/QCannedQueryImpl.h (+2/-0)
include/unity/scopes/testing/MockScope.h (+7/-0)
src/scopes/CannedQuery.cpp (+15/-0)
src/scopes/SearchQueryBase.cpp (+15/-4)
src/scopes/internal/CannedQueryImpl.cpp (+74/-1)
src/scopes/internal/ScopeImpl.cpp (+18/-0)
src/scopes/internal/SearchQueryBaseImpl.cpp (+4/-2)
src/scopes/qt/QCannedQuery.cpp (+10/-0)
src/scopes/qt/internal/QCannedQueryImpl.cpp (+10/-0)
test/gtest/scopes/CannedQuery/CannedQuery_test.cpp (+74/-4)
test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp (+7/-0)

api

Superseded for merging into lp://staging/unity-scopes-api

Unity Team: Pending requested 2015-02-12

Diff: 383 lines (+176/-3)

13 files modified

CMakeLists.txt (+1/-1)
RELEASE_NOTES.md (+4/-0)
STRUCTS (+8/-0)
debian/changelog (+6/-0)
include/unity/scopes/CannedQuery.h (+22/-0)
include/unity/scopes/internal/CannedQueryImpl.h (+5/-1)
include/unity/scopes/qt/QCannedQuery.h (+15/-0)
include/unity/scopes/qt/internal/QCannedQueryImpl.h (+2/-0)
src/scopes/CannedQuery.cpp (+15/-0)
src/scopes/internal/CannedQueryImpl.cpp (+54/-1)
src/scopes/qt/QCannedQuery.cpp (+10/-0)
src/scopes/qt/internal/QCannedQueryImpl.cpp (+10/-0)
test/gtest/scopes/CannedQuery/CannedQuery_test.cpp (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

324. By Paweł Stołowski on 2015-03-02

Renamed query_data -> user_data

323. By Paweł Stołowski on 2015-02-27

Fixed assignment copy/move tests.

322. By Paweł Stołowski on 2015-02-27

Merged symbols fix.

321. By Paweł Stołowski on 2015-02-27

Merged qt-coverage.

320. By Paweł Stołowski on 2015-02-26

Updated symbols.

319. By Paweł Stołowski on 2015-02-26

Test for move.

318. By Paweł Stołowski on 2015-02-26

Updated doc of CannedQuery.

317. By Paweł Stołowski on 2015-02-26

Two more test cases.

316. By Paweł Stołowski on 2015-02-26

More tests.

315. By Paweł Stołowski on 2015-02-26

data -> user_data also in deserialize.