Merge lp://staging/~phablet-team/messaging-app/fix_qml_tests into lp://staging/messaging-app
Proposed by
Gustavo Pichorim Boiko
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~phablet-team/messaging-app/fix_qml_tests |
| Merge into: | lp://staging/messaging-app |
| Diff against target: |
7035 lines (+3448/-1506) 67 files modified
TODO (+3/-2) debian/messaging-app.install (+1/-1) src/messagingapplication.cpp (+17/-8) src/qml/3rd_party/ba-linkify.js (+2/-0) src/qml/AccountSectionDelegate.qml (+69/-3) src/qml/AttachmentDelegates/AudioDelegate.qml (+3/-3) src/qml/AttachmentDelegates/BaseDelegate.qml (+2/-1) src/qml/AttachmentDelegates/CMakeLists.txt (+3/-3) src/qml/AttachmentDelegates/ContactDelegate.qml (+3/-3) src/qml/AttachmentDelegates/DefaultDelegate.qml (+2/-2) src/qml/AttachmentDelegates/ImageDelegate.qml (+3/-3) src/qml/AttachmentDelegates/PreviewerMultipleContacts.qml (+2/-1) src/qml/AttachmentDelegates/PreviewerVideo.qml (+2/-2) src/qml/AttachmentDelegates/VideoDelegate.qml (+3/-3) src/qml/AttachmentsDelegate.qml (+65/-171) src/qml/CMakeLists.txt (+1/-5) src/qml/ComposeBar.qml (+8/-10) src/qml/ContactSearchList.qml (+12/-14) src/qml/ContactSearchWidget.qml (+115/-0) src/qml/DeliveryStatus.qml (+1/-0) src/qml/Dialogs/EmptyGroupWarningDialog.qml (+60/-0) src/qml/Dialogs/NoNetworkDialog.qml (+39/-0) src/qml/EmptyStatePage.qml (+31/-0) src/qml/GroupChatInfoPage.qml (+472/-0) src/qml/ListItemDemo.qml (+295/-0) src/qml/LocalContactAvatar.qml (+23/-0) src/qml/MMSMessageBubble.qml (+0/-48) src/qml/MainPage.qml (+49/-29) src/qml/MessageBubble.qml (+18/-7) src/qml/MessageDateSection.qml (+8/-17) src/qml/MessageDelegate.qml (+254/-118) src/qml/MessageStatusIcon.qml (+91/-0) src/qml/Messages.qml (+548/-228) src/qml/MessagesListView.qml (+7/-81) src/qml/MessagingBottomEdge.qml (+16/-10) src/qml/MessagingContactViewPage.qml (+3/-2) src/qml/MultiRecipientInput.qml (+52/-7) src/qml/NewGroupPage.qml (+305/-0) src/qml/NewRecipientPage.qml (+8/-4) src/qml/ParticipantDelegate.qml (+73/-0) src/qml/ParticipantInfoPage.qml (+170/-0) src/qml/ParticipantsPopover.qml (+68/-0) src/qml/RegularMessageDelegate.qml (+30/-29) src/qml/SMSDelegate.qml (+0/-91) src/qml/Scrollbar.qml (+24/-0) src/qml/SettingsPage.qml (+4/-4) src/qml/SwipeItemDemo.qml (+14/-278) src/qml/ThreadDelegate.qml (+74/-15) src/qml/ThreadsSectionDelegate.qml (+43/-0) src/qml/ThumbnailContact.qml (+1/-1) src/qml/TransparentButton.qml (+1/-1) src/qml/TransparentTextFieldStype.qml (+1/-1) src/qml/assets/blue_bubble@27.sci (+4/-4) src/qml/assets/green_bubble@27.sci (+4/-4) src/qml/assets/grey_bubble@27.sci (+4/-4) src/qml/assets/media_bubble@27.sci (+4/-4) src/qml/assets/red_bubble@27.sci (+5/-5) src/qml/assets/white_bubble@27.sci (+5/-5) src/qml/dateUtils.js (+10/-24) src/qml/messaging-app.qml (+107/-77) tests/autopilot/messaging_app/emulators.py (+4/-4) tests/autopilot/messaging_app/tests/test_messaging.py (+7/-7) tests/qml/CMakeLists.txt (+3/-2) tests/qml/tst_AttachmentsDelegate.qml (+49/-103) tests/qml/tst_DualSim.qml (+61/-25) tests/qml/tst_MessagesView.qml (+47/-19) tests/qml/tst_SingleSim.qml (+35/-13) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/messaging-app/fix_qml_tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-11-11.
Commit message
Add missing mock function to fix QML test
Description of the change
Add missing mock function to fix QML test
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
