Merge remote branch qtcontacts-tracker master
authorIan Monroe <ian.monroe@collabora.co.uk>
Tue, 16 Mar 2010 11:06:04 +0000 (06:06 -0500)
committerIan Monroe <ian.monroe@collabora.co.uk>
Tue, 16 Mar 2010 11:27:06 +0000 (06:27 -0500)
commitb5ce9bf187edc6579ff90d59041028b5a0d488dc
treec57622f17a816c33be1f44dbbe49e9f92ef597db
parent653507d3e7a3914a2d9f8f3ce1a3c9803fa9338f
parent4fc5eebdf962ab20399da84a1a40c1591d1d3668
Merge remote branch qtcontacts-tracker

Conflicts:
plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.pro
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro
12 files changed:
plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp
plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h
plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h
plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp
plugins/contacts/qtcontacts-tracker/trackerchangelistener.h
plugins/contacts/qtcontacts-tracker/version.pri