Ubuntu UI Toolkit

Merge lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify into lp://staging/ubuntu-ui-toolkit/staging

qrcify
Merge into staging

Proposed by Benjamin Zeller on 2015-07-29

Status:	Work in progress
Proposed branch:	lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify
Merge into:	lp://staging/ubuntu-ui-toolkit/staging
Diff against target:	1611 lines (+862/-480) 29 files modified .bzrignore (+2/-0) .qmake.conf (+100/-0) debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+6/-15) features/ubuntu_default_build.prf (+29/-0) features/ubuntu_qml_plugin.prf (+7/-0) features/ubuntu_qrc_build.prf (+66/-0) src/Ubuntu/Components/ComponentModule.pro (+175/-133) src/Ubuntu/Components/ListItems/ListItems.pro (+18/-41) src/Ubuntu/Components/ListItems/listitemplugin.cpp (+26/-0) src/Ubuntu/Components/ListItems/listitemplugin.h (+32/-0) src/Ubuntu/Components/ListItems/listitems.qrc (+42/-0) src/Ubuntu/Components/ListItems/qmldir (+46/-45) src/Ubuntu/Components/Pickers/Pickers.pro (+19/-33) src/Ubuntu/Components/Pickers/pickers.qrc (+34/-0) src/Ubuntu/Components/Pickers/pickersplugin.cpp (+27/-0) src/Ubuntu/Components/Pickers/pickersplugin.h (+32/-0) src/Ubuntu/Components/Pickers/qmldir (+20/-18) src/Ubuntu/Components/Popups/Popups.pro (+18/-21) src/Ubuntu/Components/Popups/popups.qrc (+22/-0) src/Ubuntu/Components/Popups/popupsplugin.cpp (+26/-0) src/Ubuntu/Components/Popups/popupsplugin.h (+32/-0) src/Ubuntu/Components/Popups/qmldir (+27/-26) src/Ubuntu/Components/plugin/plugin.cpp (+28/-0) src/Ubuntu/Components/plugin/plugin.h (+5/-0) src/Ubuntu/Components/plugin/uchaptics.cpp (+1/-1) src/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1) src/Ubuntu/Components/qmldir (+0/-144) tests/apicheck/apicheck.cpp (+19/-2) ubuntu-sdk.pro (+2/-0)
To merge this branch:	bzr merge lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Needs Fixing on 2016-01-18
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-03
Zsombor Egri		2015-07-29	Pending
Review via email: mp+266216@code.staging.launchpad.net

Commit message

- Move all components to qrc files.
- Introduce plugins that carry the qrcs

Description of the change

- Move all components to qrc files.
- Introduce plugins that carry the qrcs

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-26:

FAILED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2423/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1150/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2423/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify updated on 2015-10-27

1589. By Benjamin Zeller on 2015-10-27: Add missing copyright
1590. By Benjamin Zeller on 2015-10-27: Merge with trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-27:

FAILED: Continuous integration, rev:1590
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2426/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1153/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2426/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify updated on 2015-10-27

1591. By Benjamin Zeller on 2015-10-27: Make packaging working again

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-27:

FAILED: Continuous integration, rev:1591
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2429/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1159
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1159/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1156

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2429/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify updated on 2015-10-28

1592. By Benjamin Zeller on 2015-10-28: Resolve qml file paths in qrc with an option to fallback to fs lookup

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28:

FAILED: Continuous integration, rev:1592
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2430/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1160
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1160/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1157

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2430/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify updated on 2015-10-30

1593. By Benjamin Zeller on 2015-10-30: - Implement switch between normal and qrcified build
1594. By Benjamin Zeller on 2015-10-30: wrong mode

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-30:

FAILED: Continuous integration, rev:1594
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2436/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1163/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2436/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify updated on 2015-11-03

1595. By Benjamin Zeller on 2015-11-03: Add missing files

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-03:

FAILED: Continuous integration, rev:1595
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2437/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1164/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2437/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) on 2016-01-07:

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-07:

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/13/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/13/console

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) on 2016-01-07:

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-07:

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/28/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/28/console

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-18:

FAILED: Continuous integration, rev:1595
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/64/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/146/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/64/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-01-18:

FAILED: Continuous integration, rev:1595
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/62/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/154/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/62/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1595. By Benjamin Zeller on 2015-11-03: Add missing files
1594. By Benjamin Zeller on 2015-10-30: wrong mode
1593. By Benjamin Zeller on 2015-10-30: - Implement switch between normal and qrcified build
1592. By Benjamin Zeller on 2015-10-28: Resolve qml file paths in qrc with an option to fallback to fs lookup
1591. By Benjamin Zeller on 2015-10-27: Make packaging working again
1590. By Benjamin Zeller on 2015-10-27: Merge with trunk
1588. By Benjamin Zeller on 2015-10-26: Resolve
1587. By Benjamin Zeller on 2015-09-10: Remove unused var, use qrc to load Haptics.qml
1586. By Benjamin Zeller on 2015-09-10: Merge staging

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:

Benjamin Zeller

Dan Chapman 

Tom Mirmar

Ubuntu SDK team