Merge lp://qastaging/~artmello/gallery-app/gallery-app-sdk_1_3 into lp://qastaging/gallery-app
Proposed by
Arthur Mello
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Renato Araujo Oliveira Filho | ||||
Approved revision: | 1271 | ||||
Merged at revision: | 1243 | ||||
Proposed branch: | lp://qastaging/~artmello/gallery-app/gallery-app-sdk_1_3 | ||||
Merge into: | lp://qastaging/gallery-app | ||||
Diff against target: |
3436 lines (+589/-1177) 83 files modified
rc/qml/AlbumEditor/AlbumCoverMenu.qml (+3/-3) rc/qml/AlbumEditor/AlbumEditMenu.qml (+4/-4) rc/qml/AlbumEditor/AlbumEditor.qml (+10/-20) rc/qml/AlbumViewer/AlbumCover.qml (+3/-3) rc/qml/AlbumViewer/AlbumCoverList.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageFlipper.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageFlipperPage.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayout.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutAdd.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutLeftDoubleLandscape.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutLeftPortrait.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutRightDoubleLandscape.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutRightPortrait.qml (+2/-2) rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml (+2/-2) rc/qml/AlbumViewer/AlbumOpener.qml (+2/-2) rc/qml/AlbumViewer/AlbumPageComponent.qml (+2/-2) rc/qml/AlbumViewer/AlbumPageIndicator.qml (+3/-3) rc/qml/AlbumViewer/AlbumPreviewComponent.qml (+2/-2) rc/qml/AlbumViewer/AlbumSpreadViewer.qml (+2/-2) rc/qml/AlbumViewer/AlbumViewer.qml (+35/-39) rc/qml/AlbumViewer/AlbumViewerAnimated.qml (+3/-3) rc/qml/AlbumViewer/AlbumViewerTransition.qml (+0/-404) rc/qml/AlbumViewer/AlbumViewerTransitionPortraitPage.qml (+0/-171) rc/qml/AlbumsOverview.qml (+59/-46) rc/qml/Components/AspectArea.qml (+2/-2) rc/qml/Components/Checkerboard.qml (+3/-10) rc/qml/Components/CheckerboardDelegate.qml (+2/-2) rc/qml/Components/DeleteDialog.qml (+4/-4) rc/qml/Components/DeleteOrDeleteWithContentsDialog.qml (+5/-5) rc/qml/Components/EventCard.qml (+4/-4) rc/qml/Components/MediaGrid.qml (+7/-5) rc/qml/Components/MediaSelector.qml (+3/-3) rc/qml/Components/MouseAreaWithMultipoint.qml (+2/-2) rc/qml/Components/PopupAlbumPicker.qml (+4/-4) rc/qml/Components/SwipeArea.qml (+3/-3) rc/qml/Components/TextEditOnClick.qml (+2/-2) rc/qml/EventsOverview.qml (+63/-30) rc/qml/GalleryApplication.qml (+4/-4) rc/qml/LoadingScreen.qml (+3/-10) rc/qml/MainScreen.qml (+21/-18) rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml (+5/-5) rc/qml/MediaViewer/GalleryPhotoComponent.qml (+2/-2) rc/qml/MediaViewer/GalleryPhotoEditorPage.qml (+4/-4) rc/qml/MediaViewer/MediaListView.qml (+3/-3) rc/qml/MediaViewer/MediaViewer.qml (+25/-14) rc/qml/MediaViewer/PhotoEditor.qml (+4/-4) rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml (+4/-4) rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml (+2/-2) rc/qml/MediaViewer/PhotoEditor/CropCorner.qml (+3/-3) rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml (+2/-2) rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml (+3/-3) rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml (+3/-3) rc/qml/MediaViewer/PhotoEditor/EditStack.qml (+3/-3) rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml (+3/-3) rc/qml/MediaViewer/PhotoViewerTransition.qml (+2/-2) rc/qml/MediaViewer/PopupPhotoViewer.qml (+26/-10) rc/qml/MediaViewer/SingleMediaViewer.qml (+6/-6) rc/qml/OrganicView/OrganicAlbumView.qml (+2/-2) rc/qml/OrganicView/OrganicItemInteraction.qml (+3/-3) rc/qml/OrganicView/OrganicMediaList.qml (+7/-6) rc/qml/OrganicView/OrganicView.qml (+3/-10) rc/qml/PhotosOverview.qml (+62/-37) rc/qml/PickerScreen.qml (+3/-11) rc/qml/Utility/DissolveAnimation.qml (+2/-2) rc/qml/Utility/EditingHUD.qml (+3/-3) rc/qml/Utility/ExpandAnimation.qml (+2/-2) rc/qml/Utility/FadeInAnimation.qml (+2/-2) rc/qml/Utility/FadeOutAnimation.qml (+2/-2) rc/qml/Utility/PhotosToolbarActions.qml (+0/-57) rc/qml/Utility/SelectionState.qml (+2/-2) rc/qml/Utility/SelectionToolbarAction.qml (+0/-82) src/photo/photo.cpp (+1/-0) src/photo/photo.h (+4/-1) tests/autopilot/gallery_app/emulators/album_view.py (+27/-0) tests/autopilot/gallery_app/emulators/photo_viewer.py (+35/-12) tests/autopilot/gallery_app/emulators/picker_screen.py (+3/-3) tests/autopilot/gallery_app/tests/test_album_editor.py (+1/-1) tests/autopilot/gallery_app/tests/test_album_view.py (+22/-14) tests/autopilot/gallery_app/tests/test_albums_view.py (+2/-3) tests/autopilot/gallery_app/tests/test_events_view.py (+2/-3) tests/autopilot/gallery_app/tests/test_photo_viewer.py (+15/-9) tests/autopilot/gallery_app/tests/test_photos_view.py (+2/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-sdk_1_3 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Renato Araujo Oliveira Filho (community) | Approve | ||
Review via email:
|
Commit message
Update QML code to work with Ubuntu.Components 1.3
Description of the change
Update QML code to work with Ubuntu.Components 1.3
To post a comment you must log in.
FAILED: Continuous integration, rev:1246 jenkins. qa.ubuntu. com/job/ gallery- app-ci/ 1192/ jenkins. qa.ubuntu. com/job/ gallery- app-vivid- amd64-ci/ 120 jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 120/console jenkins. qa.ubuntu. com/job/ gallery- app-vivid- i386-ci/ 120 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/286 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/940 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 771 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 24714
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/gallery- app-ci/ 1192/rebuild
http://