Merge lp:~fboucault/address-book-app/toolkit13 into lp:address-book-app
Proposed by
Florian Boucault
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Renato Araujo Oliveira Filho | ||||
Approved revision: | 472 | ||||
Merged at revision: | 490 | ||||
Proposed branch: | lp:~fboucault/address-book-app/toolkit13 | ||||
Merge into: | lp: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:~fboucault/address-book-app/toolkit13 | ||||
Related bugs: |
|
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.launchpad.net |
Commit message
Upgraded all imports of toolkit to version 1.3.
Removed use of former MainView.
Fixed deprecation warnings related to UbuntuShape in toolkit 1.3.
Description of the change
There is another branch to fix all autopilot: https:/
To post a comment you must log in.
Caveat: ContentPeerPicker with Toolkit 1.3 shows a double header.