lp://staging/~boiko/history-service/move_private_to_shared_lib

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/history-service at revision 215

Tiago Salem Herrmann (community): Approve on 2015-10-08

PS Jenkins bot: Approve (continuous-integration) on 2015-10-08

Diff: 809 lines (+106/-93)

30 files modified

CMakeLists.txt (+0/-1)
Ubuntu/History/CMakeLists.txt (+0/-2)
Ubuntu/History/historyeventmodel.cpp (+1/-1)
Ubuntu/History/historymodel.cpp (+5/-5)
cmake/modules/GenerateTest.cmake (+1/-1)
daemon/CMakeLists.txt (+0/-2)
daemon/historydaemon.cpp (+4/-4)
historyprivate/CMakeLists.txt (+0/-22)
plugins/sqlite/CMakeLists.txt (+1/-2)
plugins/sqlite/schema/CMakeLists.txt (+1/-1)
plugins/sqlite/sqlitedatabase.cpp (+2/-2)
plugins/sqlite/sqlitehistoryplugin.cpp (+7/-7)
src/CMakeLists.txt (+12/-4)
src/channelobserver.cpp (+5/-0)
src/channelobserver_p.h (+5/-0)
src/contactmatcher.cpp (+9/-4)
src/contactmatcher_p.h (+5/-0)
src/phoneutils.cpp (+5/-0)
src/phoneutils_p.h (+5/-0)
src/telepathyhelper.cpp (+5/-0)
src/telepathyhelper_p.h (+5/-0)
tests/CMakeLists.txt (+0/-1)
tests/common/CMakeLists.txt (+2/-2)
tests/common/telepathytest.cpp (+2/-2)
tests/daemon/CMakeLists.txt (+0/-1)
tests/daemon/DaemonTest.cpp (+3/-3)
tests/historyprivate/CMakeLists.txt (+0/-12)
tests/libhistoryservice/CMakeLists.txt (+7/-0)
tests/libhistoryservice/ContactMatcherTest.cpp (+12/-12)
tests/libhistoryservice/PhoneUtilsTest.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

256. By Gustavo Pichorim Boiko on 2015-10-13

Merge parent.

255. By Gustavo Pichorim Boiko on 2015-10-09

Merge parent branch

254. By Gustavo Pichorim Boiko on 2015-10-08

Merge parent changes

253. By Gustavo Pichorim Boiko on 2015-10-08

Merge latest changes from parent.

252. By Gustavo Pichorim Boiko on 2015-10-08

Merge latest changes from parent branch.

251. By Gustavo Pichorim Boiko on 2015-10-07

Merge changes from parent branch.

250. By Gustavo Pichorim Boiko on 2015-10-07

Merge latest changes from parent branch.

249. By Gustavo Pichorim Boiko on 2015-10-06

Move ChannelObserver to History namespace.

248. By Gustavo Pichorim Boiko on 2015-10-06

Move ContactMatcher to History namespace.

247. By Gustavo Pichorim Boiko on 2015-10-06

Move PhoneUtils to History namespace.