camera-app

Merge lp://qastaging/~fboucault/camera-app/toolkit13 into lp://qastaging/camera-app

toolkit13
Merge into trunk

Proposed by Florian Boucault on 2015-10-22

Status:

Merged

Approved by:

Florian Boucault on 2015-10-23

Approved revision:

591

Merged at revision:

586

Proposed branch:

lp://qastaging/~fboucault/camera-app/toolkit13

Merge into:

lp://qastaging/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://qastaging/~fboucault/camera-app/toolkit13

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-22
Ubuntu Phablet Team		2015-10-22	Pending
Review via email: mp+275325@code.qastaging.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.

lp://qastaging/~fboucault/camera-app/toolkit13 updated on 2015-10-22

587. By Florian Boucault on 2015-10-22: Switched to QtQuick 2.4 and QtQuick.Window 2.2
588. By Florian Boucault on 2015-10-22: Switched to QtQuick 2.4 and QtQuick.Window 2.2
589. By Florian Boucault on 2015-10-22: Switched to QtQuick 2.4 and QtQuick.Window 2.2
590. By Florian Boucault on 2015-10-22: Tag bug
591. By Florian Boucault on 2015-10-22: Fixed used of Theme