Online Accounts: libaccounts-qt

Merge lp://staging/~mardy/libaccounts-qt/packaging into lp://staging/libaccounts-qt

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 140
Proposed branch: lp://staging/~mardy/libaccounts-qt/packaging
Merge into: lp://staging/libaccounts-qt
Diff against target: 229 lines (+64/-13)
13 files modified
.gitignore (+2/-0)
Accounts/Accounts.pro (+10/-6)
Accounts/AccountsQt5Config.cmake.in (+5/-0)
Accounts/AccountsQt5ConfigVersion.cmake.in (+10/-0)
Accounts/provider.cpp (+14/-3)
Accounts/provider.h (+2/-1)
common-project-config.pri (+1/-1)
common-vars.pri (+1/-1)
debian/changelog (+15/-0)
debian/libaccounts-qt-dev.install (+1/-1)
debian/libaccounts-qt5-dev.install (+1/-0)
tests/MyProvider.provider (+1/-0)
tests/accountstest.cpp (+1/-0)
To merge this branch: bzr merge lp://staging/~mardy/libaccounts-qt/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Renato Araujo Oliveira Filho (community) Approve
Alexandre Abreu (community) Approve
Review via email: mp+209903@code.staging.launchpad.net

Commit message

Merge from upstream

This adds the Provider::domainsRegExp() method and fixes a bug when a NULL AgProvider pointer was getting unreferenced.

Description of the change

Merge from upstream

This adds the Provider::domainsRegExp() method and fixes a bug when a NULL AgProvider pointer was getting unreferenced.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/libaccounts-qt-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-qt-ci/15/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/libaccounts-qt-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-qt-ci/16/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/libaccounts-qt-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-qt-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/libaccounts-qt-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-qt-ci/19/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

works nice with contact sync.

review: Approve
lp://staging/~mardy/libaccounts-qt/packaging updated
138. By Łukasz Zemczak

Fix file conflicts in the -dev packages. As recommended by upstream, we only ship the cmake files for the -qt-dev package, as soon they will add specific variants for every Qt version

139. By PS Jenkins bot

Releasing 1.11+14.04.20140410.1-0ubuntu1

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/libaccounts-qt-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/libaccounts-qt-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libaccounts-qt-ci/20/rebuild

review: Approve (continuous-integration)
lp://staging/~mardy/libaccounts-qt/packaging updated
140. By Alberto Mardegan

Merge from upstream

This adds the Provider::domainsRegExp() method and fixes a bug when a NULL AgProvider pointer was getting unreferenced.

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: