Merge into staging : fix_qtdbus_5.6 : Code : telephony-service

Status:	Merged
Approved by:	Roberto Mier Escandon on 2016-10-27
Approved revision:	1206
Merged at revision:	1228
Proposed branch:	lp://staging/~phablet-team/telephony-service/fix_qtdbus_5.6
Merge into:	lp://staging/telephony-service/staging
Prerequisite:	lp://staging/~phablet-team/telephony-service/re-enable_tests
Diff against target:	84 lines (+7/-24) 4 files modified approver/approverdbus.cpp (+1/-6) handler/handlerdbus.cpp (+1/-6) indicator/indicatordbus.cpp (+1/-6) tests/common/mock/mockconnectiondbus.cpp (+4/-6)
To merge this branch:	bzr merge lp://staging/~phablet-team/telephony-service/fix_qtdbus_5.6
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Roberto Mier Escandon (community)		2016-10-26	Approve on 2016-10-27
system-apps-ci-bot	continuous-integration	2016-10-26	Pending
Review via email: mp+309396@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-09-19.

Commit message

Adapt the registration of objects and services to the way QtDBus works from 5.6.x on.

Description of the change

Adapt the registration of objects and services to the way QtDBus works from 5.6.x on.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-19: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/60/rebuild

FAILED: Continuous integration, rev:1205
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/60/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1563/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1563
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1410/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1410/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1410
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1410/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1410/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/60/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~phablet-team/telephony-service/fix_qtdbus_5.6 updated on 2016-10-26

1206. By Gustavo Pichorim Boiko on 2016-10-26: Merge parent branch

Revision history for this message

Roberto Mier Escandon (rmescandon) wrote on 2016-10-27:

#

lgtm

review: Approve

telephony-service

Merge lp://staging/~phablet-team/telephony-service/fix_qtdbus_5.6 into lp://staging/telephony-service/staging

Commit message

Description of the change

Preview Diff

Subscribers