Merge lp://qastaging/~ken-vandine/ubuntu-system-settings/1_3_deprecations into lp://qastaging/ubuntu-system-settings

Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp://qastaging/~ken-vandine/ubuntu-system-settings/1_3_deprecations
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 2178 lines (+351/-350)
125 files modified
debian/control (+1/-1)
plugins/about/DevMode.qml (+3/-3)
plugins/about/EntryComponent.qml (+3/-3)
plugins/about/License.qml (+3/-3)
plugins/about/PageComponent.qml (+3/-3)
plugins/about/PhoneNumber.qml (+2/-2)
plugins/about/PhoneNumbers.qml (+2/-2)
plugins/about/SingleValueStacked.qml (+3/-3)
plugins/about/Software.qml (+3/-3)
plugins/about/Storage.qml (+3/-3)
plugins/about/StorageBar.qml (+4/-4)
plugins/about/StorageItem.qml (+3/-3)
plugins/about/Version.qml (+3/-3)
plugins/background/Components/AddRemove.qml (+2/-2)
plugins/background/Components/HighlightedOverlay.qml (+2/-2)
plugins/background/Components/ListItemsHeader.qml (+3/-3)
plugins/background/Components/OverlayImage.qml (+2/-2)
plugins/background/Components/SelectedOverlay.qml (+1/-1)
plugins/background/MainPage.qml (+4/-4)
plugins/background/Preview.qml (+3/-4)
plugins/background/WallpaperGrid.qml (+4/-4)
plugins/battery/PageComponent.qml (+3/-3)
plugins/battery/SleepValues.qml (+3/-3)
plugins/bluetooth/ConfirmPasskeyDialog.qml (+3/-3)
plugins/bluetooth/DisplayPasskeyDialog.qml (+3/-3)
plugins/bluetooth/PageComponent.qml (+4/-4)
plugins/bluetooth/ProvidePasskeyDialog.qml (+3/-3)
plugins/bluetooth/ProvidePinCodeDialog.qml (+3/-3)
plugins/brightness/PageComponent.qml (+3/-3)
plugins/cellular/Common.qml (+1/-1)
plugins/cellular/Components/DataMultiSim.qml (+3/-3)
plugins/cellular/Components/DefaultSim.qml (+3/-3)
plugins/cellular/Components/KeyboardRectangle.qml (+1/-1)
plugins/cellular/Components/LabelTextField.qml (+3/-3)
plugins/cellular/Components/MultiSim.qml (+3/-3)
plugins/cellular/Components/NoSim.qml (+2/-2)
plugins/cellular/Components/RadioSingleSim.qml (+3/-3)
plugins/cellular/Components/Sim.qml (+1/-1)
plugins/cellular/Components/SimEditor.qml (+3/-3)
plugins/cellular/Components/SingleSim.qml (+3/-3)
plugins/cellular/Components/StandardAnimation.qml (+1/-1)
plugins/cellular/Hotspot.qml (+4/-4)
plugins/cellular/HotspotSetup.qml (+4/-4)
plugins/cellular/PageApnEditor.qml (+4/-4)
plugins/cellular/PageCarrierAndApn.qml (+3/-3)
plugins/cellular/PageCarriersAndApns.qml (+3/-3)
plugins/cellular/PageChooseApn.qml (+4/-4)
plugins/cellular/PageChooseCarrier.qml (+3/-3)
plugins/cellular/PageComponent.qml (+3/-3)
plugins/example/PageComponent.qml (+2/-2)
plugins/flight-mode/EntryComponent.qml (+3/-3)
plugins/language/DisplayLanguage.qml (+4/-4)
plugins/language/KeyboardLayoutItem.qml (+3/-3)
plugins/language/KeyboardLayouts.qml (+1/-1)
plugins/language/PageComponent.qml (+4/-4)
plugins/language/RebootNecessary.qml (+3/-3)
plugins/language/SpellChecking.qml (+3/-3)
plugins/language/SubsetView.qml (+3/-3)
plugins/notifications/PageComponent.qml (+3/-3)
plugins/orientation-lock/EntryComponent.qml (+3/-3)
plugins/phone/CallForwardItem.qml (+3/-3)
plugins/phone/CallForwarding.qml (+4/-4)
plugins/phone/CallWaiting.qml (+3/-3)
plugins/phone/KeyboardRectangle.qml (+1/-1)
plugins/phone/MultiSim.qml (+3/-3)
plugins/phone/NoSims.qml (+3/-3)
plugins/phone/Ofono.qml (+1/-1)
plugins/phone/PageComponent.qml (+3/-3)
plugins/phone/ServiceInfo.qml (+3/-3)
plugins/phone/Services.qml (+3/-3)
plugins/phone/SingleSim.qml (+3/-3)
plugins/phone/VCardParser.qml (+1/-1)
plugins/reset/EntryComponent.qml (+3/-3)
plugins/reset/EraseEverything.qml (+3/-3)
plugins/reset/PageComponent.qml (+4/-4)
plugins/reset/ResetAllSettings.qml (+3/-3)
plugins/reset/ResetLauncherHome.qml (+3/-3)
plugins/security-privacy/AppAccess.qml (+3/-3)
plugins/security-privacy/AppAccessControl.qml (+3/-3)
plugins/security-privacy/Location.qml (+3/-3)
plugins/security-privacy/LockSecurity.qml (+4/-4)
plugins/security-privacy/Ofono.qml (+1/-1)
plugins/security-privacy/PageComponent.qml (+3/-3)
plugins/security-privacy/PhoneLocking.qml (+3/-3)
plugins/security-privacy/SimPin.qml (+4/-4)
plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+3/-3)
plugins/security-privacy/diagnostics/PageComponent.qml (+3/-3)
plugins/security-privacy/here-terms.qml (+2/-2)
plugins/sound/PageComponent.qml (+3/-3)
plugins/sound/SilentModeWarning.qml (+3/-3)
plugins/sound/SoundsList.qml (+3/-3)
plugins/system-update/Configuration.qml (+3/-3)
plugins/system-update/EntryComponent.qml (+3/-3)
plugins/system-update/PageComponent.qml (+4/-4)
plugins/time-date/ChooseTimeZone.qml (+3/-3)
plugins/time-date/PageComponent.qml (+4/-4)
plugins/time-date/Scroller.qml (+3/-3)
plugins/time-date/TimePicker.qml (+4/-4)
plugins/wifi/AccessPoint.qml (+3/-3)
plugins/wifi/BaseMenuItem.qml (+2/-2)
plugins/wifi/CertDialog.qml (+4/-4)
plugins/wifi/CertPicker.qml (+3/-3)
plugins/wifi/Common.qml (+1/-1)
plugins/wifi/DivMenuItem.qml (+2/-2)
plugins/wifi/FramedMenuItem.qml (+3/-3)
plugins/wifi/HLine.qml (+2/-2)
plugins/wifi/IndicatorBase.qml (+2/-2)
plugins/wifi/MenuItemFactory.qml (+1/-1)
plugins/wifi/NetworkDetails.qml (+3/-3)
plugins/wifi/NetworkDetailsBrief.qml (+3/-3)
plugins/wifi/OtherNetwork.qml (+4/-4)
plugins/wifi/PageComponent.qml (+4/-4)
plugins/wifi/PreviousNetworks.qml (+3/-3)
plugins/wifi/RemoveBackground.qml (+2/-2)
plugins/wifi/SectionMenuItem.qml (+3/-3)
plugins/wifi/StandardMenuItem.qml (+2/-2)
plugins/wifi/SwitchMenuItem.qml (+2/-2)
src/SystemSettings/ItemPage.qml (+2/-2)
src/SystemSettings/SettingsItemTitle.qml (+3/-3)
src/qml/CategoryGrid.qml (+3/-3)
src/qml/EntryComponent.qml (+3/-3)
src/qml/MainWindow.qml (+3/-4)
src/qml/UncategorizedItemsView.qml (+3/-3)
tests/autopilot/ubuntu_system_settings/__init__.py (+3/-0)
tests/test-plugin.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~ken-vandine/ubuntu-system-settings/1_3_deprecations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Jonas G. Drange (community) Approve
Review via email: mp+267241@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2015-08-14.

Commit message

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

Description of the change

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve
1498. By Ken VanDine

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

1499. By Ken VanDine

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

1500. By Ken VanDine

Bump Ubuntu.Components imports to 1.3

1501. By Ken VanDine

bumped depends for qtdeclarative5-ubuntu-ui-toolkit-plugin to 1.3.1584

1502. By Ken VanDine

remove useDeprecatedToolbar

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1503. By Ken VanDine

fixed import for Ubuntu.Settings.Components

1504. By Ken VanDine

revert

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1505. By Ken VanDine

Dropped usage of the tools property that has been removed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1506. By Ken VanDine

bump QtQuick imports to 2.4

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1507. By Ken VanDine

merged trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1508. By Ken VanDine

merged wifi_dismiss_osk branch

1509. By Ken VanDine

merged trunk

1510. By Ken VanDine

merged trunk

1511. By Ken VanDine

Merged trunk

1512. By Ken VanDine

merged fix from jgdx

Unmerged revisions

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