address-book-app

Merge lp://qastaging/~fboucault/address-book-app/toolkit13 into lp://qastaging/address-book-app

  1. toolkit13
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 472
Merged at revision: 490
Proposed branch: lp://qastaging/~fboucault/address-book-app/toolkit13
Merge into: lp://qastaging/address-book-app
Diff against target: 881 lines (+94/-92)
58 files modified
src/imports/ABContactEditorPage.qml (+1/-1)
src/imports/ABContactListPage.qml (+3/-3)
src/imports/ABContactViewPage.qml (+2/-2)
src/imports/MainWindow.qml (+2/-2)
src/imports/Settings/SettingsPage.qml (+2/-2)
src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+2/-2)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+2/-2)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+2/-2)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactListView.qml (+3/-3)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+2/-2)
src/imports/Ubuntu/Contacts/FastScroll.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml (+1/-1)
src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml (+2/-2)
src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml (+1/-1)
src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+2/-2)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+2/-2)
src/imports/Ubuntu/Contacts/SectionDelegate.qml (+2/-2)
src/imports/Ubuntu/Contacts/SubtitledWithColors.qml (+1/-1)
src/imports/VCardImportDialog.qml (+2/-2)
tests/autopilot/address_book_app/__init__.py (+3/-1)
tests/qml/tst_ContactEditor.qml (+4/-4)
tests/qml/tst_ContactList.qml (+1/-1)
tests/qml/tst_ContactListModel.qml (+1/-1)
tests/qml/tst_ContactListView.qml (+1/-1)
tests/qml/tst_ContactPreviewPage.qml (+1/-1)
tests/qml/tst_ListWithActions.qml (+1/-1)
To merge this branch: bzr merge lp://qastaging/~fboucault/address-book-app/toolkit13
Reviewer Review Type Date Requested Status
Victor Thompson (community) Needs Information
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Florian Boucault (community) Needs Fixing
Review via email: mp+270111@code.qastaging.launchpad.net

Commit message

Upgraded all imports of toolkit to version 1.3.
Removed use of former MainView.useDeprecatedToolbar property.
Fixed deprecation warnings related to UbuntuShape in toolkit 1.3.

Description of the change

There is another branch to fix all autopilot: https://code.launchpad.net/~renatofilho/address-book-app/autopilot-and-sdk-1.3/+merge/272833

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

Caveat: ContentPeerPicker with Toolkit 1.3 shows a double header.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/906/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/209/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4009/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4006/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/906/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/address-book-app/toolkit13 updated
470. By Florian Boucault

Fixed QML test ContactEditor: header buttons objectNames have changed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/908/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/211
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4021
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4018
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4018/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23066

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/908/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~fboucault/address-book-app/toolkit13 updated
471. By Florian Boucault

Fix AP tests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/910/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4023
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4023/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23070

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/910/rebuild

review: Approve (continuous-integration)
lp://qastaging/~fboucault/address-book-app/toolkit13 updated
472. By Florian Boucault

Merged with trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/960/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/263
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4682
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4679
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24288

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/960/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Looks good.

review: Approve
Revision history for this message
Victor Thompson (vthompson) wrote :

Should this also be updated to use QtQuick 2.4, as that is what the SDK uses?

review: Needs Information

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