Merge lp:~fboucault/camera-app/toolkit13 into lp:camera-app
Proposed by
Florian Boucault
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Florian Boucault | ||||
Approved revision: | 591 | ||||
Merged at revision: | 586 | ||||
Proposed branch: | lp:~fboucault/camera-app/toolkit13 | ||||
Merge into: | lp:camera-app | ||||
Diff against target: |
518 lines (+71/-71) 31 files modified
BottomEdgeIndicators.qml (+2/-2) CircleButton.qml (+3/-3) DeleteDialog.qml (+3/-3) FocusRing.qml (+2/-2) GalleryView.qml (+2/-2) GalleryViewHeader.qml (+5/-5) GalleryViewLoader.qml (+1/-1) IconButton.qml (+2/-2) NoSpaceHint.qml (+2/-2) OptionButton.qml (+1/-1) OptionValueButton.qml (+2/-2) OptionsOverlay.qml (+2/-2) PhotoEditorLoader.qml (+1/-1) PhotoRollHint.qml (+2/-2) PhotogridView.qml (+3/-3) SharePopover.qml (+4/-4) ShootButton.qml (+2/-2) SlideshowView.qml (+5/-5) Snapshot.qml (+3/-3) StopWatch.qml (+3/-3) ThinSliderStyle.qml (+2/-2) ViewFinderExportConfirmation.qml (+2/-2) ViewFinderGeometry.qml (+1/-1) ViewFinderOverlay.qml (+4/-4) ViewFinderOverlayLoader.qml (+1/-1) ViewFinderView.qml (+3/-3) ZoomControl.qml (+2/-2) camera-app.qml (+3/-3) tests/unittests/tst_BottomEdgeIndicators.qml (+1/-1) tests/unittests/tst_StopWatch.qml (+1/-1) tests/unittests/tst_ViewFinderGeometry.qml (+1/-1) |
||||
To merge this branch: | bzr merge lp:~fboucault/camera-app/toolkit13 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+275325@code.launchpad.net |
Commit message
Migrated to using Ubuntu UI Toolkit version 1.3 only.
Migrated to using QtQuick 2.4 and QtQuick.Window 2.2 only.
To post a comment you must log in.
FAILED: Continuous integration, rev:586 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 438/ jenkins. qa.ubuntu. com/job/ camera- app-vivid- amd64-ci/ 134/console jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 134/console jenkins. qa.ubuntu. com/job/ camera- app-vivid- i386-ci/ 134/console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/279 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/933 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 760 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 24469
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 438/rebuild
http://