Merge lp://staging/~timo-jyrinki/ubuntu/saucy/qtpim-opensource-src/new_snapshot into lp://staging/ubuntu/saucy/qtpim-opensource-src

Proposed by Timo Jyrinki
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp://staging/~timo-jyrinki/ubuntu/saucy/qtpim-opensource-src/new_snapshot
Merge into: lp://staging/ubuntu/saucy/qtpim-opensource-src
Diff against target: 1998 lines (+149/-1557)
23 files modified
.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/ContactEditor.qml (+0/-92)
.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/DetailEditWidget.qml (+0/-81)
.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact.cpp (+0/-765)
.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact_p.h (+0/-209)
.pc/applied-patches (+0/-1)
.tag (+1/-1)
debian/changelog (+8/-0)
debian/patches/added-support-to-preferreddetails-on-qml-contact.patch (+0/-359)
debian/patches/series (+0/-1)
src/contacts/details/qcontacttype.h (+1/-1)
src/contacts/qcontactabstractrequest.h (+1/-1)
src/contacts/qcontactactionfactory.h (+1/-1)
src/contacts/qcontactdetail.h (+10/-10)
src/contacts/qcontactfetchhint.h (+1/-1)
src/contacts/qcontactfilter.h (+1/-1)
src/contacts/qcontactid.h (+1/-1)
src/contacts/qcontactmanager.cpp (+4/-0)
src/contacts/qcontactmanager.h (+1/-1)
src/imports/contacts/qdeclarativecontact.cpp (+2/-2)
src/imports/contacts/qdeclarativecontact_p.h (+1/-1)
src/imports/contacts/qdeclarativecontactmodel.cpp (+113/-26)
src/imports/contacts/qdeclarativecontactmodel_p.h (+1/-0)
tests/auto/contacts/qcontact/tst_qcontact.cpp (+2/-2)
To merge this branch: bzr merge lp://staging/~timo-jyrinki/ubuntu/saucy/qtpim-opensource-src/new_snapshot
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+182874@code.staging.launchpad.net

Commit message

* New upstream snapshot release
  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
    - Drop, merged upstream

Description of the change

* New upstream snapshot release
  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
    - Drop, merged upstream

From packaging branch lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

Test build at https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-proper/+sourcepub/3452535/+listing-archive-extra

Tested by upgrading from the PPA, compiling and running examples from the source code.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: