ubuntu-system-settings

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

  1. 1_3_deprecations
  2. Merge into trunk
Proposed by Ken VanDine on 2015-08-06
Status: Superseded
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations
Merge into: lp: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:~ken-vandine/ubuntu-system-settings/1_3_deprecations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-08-14
Jonas G. Drange (community) 2015-08-06 Approve on 2015-08-06
Review via email: mp+267241@code.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.
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-08-06
1498. By Ken VanDine on 2015-08-06

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

1499. By Ken VanDine on 2015-08-06

Bump Ubuntu.Components imports to 1.3 and fixed UbuntuShape deprecations

1500. By Ken VanDine on 2015-08-06

Bump Ubuntu.Components imports to 1.3

1501. By Ken VanDine on 2015-08-06

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

1502. By Ken VanDine on 2015-08-06

remove useDeprecatedToolbar

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1497
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2269/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/453
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3602/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22382

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2269/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1502
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2271/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3608/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/455
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2984/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3605
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22388

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2271/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-08-07
1503. By Ken VanDine on 2015-08-07

fixed import for Ubuntu.Settings.Components

1504. By Ken VanDine on 2015-08-07

revert

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1504
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2272/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/456
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22394

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2272/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-08-07
1505. By Ken VanDine on 2015-08-07

Dropped usage of the tools property that has been removed

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1505
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2274/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/458
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3612
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22398

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2274/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-08-10
1506. By Ken VanDine on 2015-08-10

bump QtQuick imports to 2.4

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1506
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2277/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/461
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22422

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2277/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-08-13
1507. By Ken VanDine on 2015-08-13

merged trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2289/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/473
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3050
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3692
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22539

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2289/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2291/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3698/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/475
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3053/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22544

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2291/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2292/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3699/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/476
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3054/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3696
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22546

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2292/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3704/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/477
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3057/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22550

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2293/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2297/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3712/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/481
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3064/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3709
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3709/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22562

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2297/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2299/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/483
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3717
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22571

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2299/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2303/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/487
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22585

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2303/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/1_3_deprecations updated on 2015-10-20
1508. By Ken VanDine on 2015-08-14

merged wifi_dismiss_osk branch

1509. By Ken VanDine on 2015-08-21

merged trunk

1510. By Ken VanDine on 2015-09-18

merged trunk

1511. By Ken VanDine on 2015-10-16

Merged trunk

1512. By Ken VanDine on 2015-10-20

merged fix from jgdx

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-07-16 09:22:42 +0000
3+++ debian/control 2015-08-14 14:39:53 +0000
4@@ -78,7 +78,7 @@
5 qtdeclarative5-systeminfo-plugin,
6 qtdeclarative5-ubuntu-content1,
7 qtdeclarative5-ubuntu-settings-components (>> 0.6),
8- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),
9+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
10 suru-icon-theme,
11 whoopsie-preferences (>= 0.9),
12 libsystemsettings1 (= ${binary:Version}),
13
14=== modified file 'plugins/about/DevMode.qml'
15--- plugins/about/DevMode.qml 2015-03-16 13:51:36 +0000
16+++ plugins/about/DevMode.qml 2015-08-14 14:39:53 +0000
17@@ -21,11 +21,11 @@
18 *
19 */
20
21-import QtQuick 2.0
22+import QtQuick 2.4
23 import Qt.labs.folderlistmodel 1.0
24 import SystemSettings 1.0
25-import Ubuntu.Components 0.1
26-import Ubuntu.Components.ListItems 0.1 as ListItem
27+import Ubuntu.Components 1.3
28+import Ubuntu.Components.ListItems 1.3 as ListItem
29 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
30 import Ubuntu.SystemSettings.StorageAbout 1.0
31
32
33=== modified file 'plugins/about/EntryComponent.qml'
34--- plugins/about/EntryComponent.qml 2014-04-10 13:48:36 +0000
35+++ plugins/about/EntryComponent.qml 2015-08-14 14:39:53 +0000
36@@ -18,9 +18,9 @@
37 * with this program. If not, see <http://www.gnu.org/licenses/>.
38 */
39
40-import QtQuick 2.0
41-import Ubuntu.Components 0.1
42-import Ubuntu.Components.ListItems 0.1 as ListItem
43+import QtQuick 2.4
44+import Ubuntu.Components 1.3
45+import Ubuntu.Components.ListItems 1.3 as ListItem
46
47 ListItem.Standard {
48 id: root
49
50=== modified file 'plugins/about/License.qml'
51--- plugins/about/License.qml 2014-09-02 08:42:27 +0000
52+++ plugins/about/License.qml 2015-08-14 14:39:53 +0000
53@@ -1,7 +1,7 @@
54-import QtQuick 2.0
55+import QtQuick 2.4
56 import SystemSettings 1.0
57-import Ubuntu.Components 0.1
58-import Ubuntu.Components.ListItems 0.1 as ListItem
59+import Ubuntu.Components 1.3
60+import Ubuntu.Components.ListItems 1.3 as ListItem
61 import Ubuntu.SystemSettings.StorageAbout 1.0
62
63 ItemPage {
64
65=== modified file 'plugins/about/PageComponent.qml'
66--- plugins/about/PageComponent.qml 2015-04-13 19:06:15 +0000
67+++ plugins/about/PageComponent.qml 2015-08-14 14:39:53 +0000
68@@ -18,11 +18,11 @@
69 * with this program. If not, see <http://www.gnu.org/licenses/>.
70 */
71
72-import QtQuick 2.0
73+import QtQuick 2.4
74 import QtSystemInfo 5.0
75 import SystemSettings 1.0
76-import Ubuntu.Components 0.1
77-import Ubuntu.Components.ListItems 0.1 as ListItem
78+import Ubuntu.Components 1.3
79+import Ubuntu.Components.ListItems 1.3 as ListItem
80 import Ubuntu.SystemSettings.StorageAbout 1.0
81 import Ubuntu.SystemSettings.Update 1.0
82 import MeeGo.QOfono 0.2
83
84=== modified file 'plugins/about/PhoneNumber.qml'
85--- plugins/about/PhoneNumber.qml 2014-09-01 16:10:30 +0000
86+++ plugins/about/PhoneNumber.qml 2015-08-14 14:39:53 +0000
87@@ -18,9 +18,9 @@
88 * with this program. If not, see <http://www.gnu.org/licenses/>.
89 */
90
91-import QtQuick 2.0
92+import QtQuick 2.4
93 import MeeGo.QOfono 0.2
94-import Ubuntu.Components.ListItems 0.1 as ListItem
95+import Ubuntu.Components.ListItems 1.3 as ListItem
96
97 ListItem.SingleValue {
98
99
100=== modified file 'plugins/about/PhoneNumbers.qml'
101--- plugins/about/PhoneNumbers.qml 2014-09-01 16:10:30 +0000
102+++ plugins/about/PhoneNumbers.qml 2015-08-14 14:39:53 +0000
103@@ -18,10 +18,10 @@
104 * with this program. If not, see <http://www.gnu.org/licenses/>.
105 */
106
107-import QtQuick 2.0
108+import QtQuick 2.4
109 import GSettings 1.0
110 import MeeGo.QOfono 0.2
111-import Ubuntu.Components.ListItems 0.1 as ListItem
112+import Ubuntu.Components.ListItems 1.3 as ListItem
113
114 Column {
115
116
117=== modified file 'plugins/about/SingleValueStacked.qml'
118--- plugins/about/SingleValueStacked.qml 2014-09-05 14:38:39 +0000
119+++ plugins/about/SingleValueStacked.qml 2015-08-14 14:39:53 +0000
120@@ -22,9 +22,9 @@
121 * DRY
122 *
123 */
124-import QtQuick 2.0
125-import Ubuntu.Components 0.1
126-import Ubuntu.Components.ListItems 0.1 as ListItem
127+import QtQuick 2.4
128+import Ubuntu.Components 1.3
129+import Ubuntu.Components.ListItems 1.3 as ListItem
130
131 ListItem.SingleValue {
132
133
134=== modified file 'plugins/about/Software.qml'
135--- plugins/about/Software.qml 2014-03-09 15:21:33 +0000
136+++ plugins/about/Software.qml 2015-08-14 14:39:53 +0000
137@@ -1,8 +1,8 @@
138-import QtQuick 2.0
139+import QtQuick 2.4
140 import Qt.labs.folderlistmodel 1.0
141 import SystemSettings 1.0
142-import Ubuntu.Components 0.1
143-import Ubuntu.Components.ListItems 0.1 as ListItem
144+import Ubuntu.Components 1.3
145+import Ubuntu.Components.ListItems 1.3 as ListItem
146 import Ubuntu.SystemSettings.StorageAbout 1.0
147
148 ItemPage {
149
150=== modified file 'plugins/about/Storage.qml'
151--- plugins/about/Storage.qml 2015-02-18 15:35:11 +0000
152+++ plugins/about/Storage.qml 2015-08-14 14:39:53 +0000
153@@ -19,11 +19,11 @@
154 */
155
156 import GSettings 1.0
157-import QtQuick 2.0
158+import QtQuick 2.4
159 import QtSystemInfo 5.0
160 import SystemSettings 1.0
161-import Ubuntu.Components 0.1
162-import Ubuntu.Components.ListItems 0.1 as ListItem
163+import Ubuntu.Components 1.3
164+import Ubuntu.Components.ListItems 1.3 as ListItem
165 import Ubuntu.SystemSettings.StorageAbout 1.0
166
167 ItemPage {
168
169=== modified file 'plugins/about/StorageBar.qml'
170--- plugins/about/StorageBar.qml 2013-09-20 16:14:23 +0000
171+++ plugins/about/StorageBar.qml 2015-08-14 14:39:53 +0000
172@@ -1,5 +1,5 @@
173-import QtQuick 2.0
174-import Ubuntu.Components 0.1
175+import QtQuick 2.4
176+import Ubuntu.Components 1.3
177
178 Item {
179 property bool ready: false
180@@ -9,11 +9,11 @@
181
182 UbuntuShape {
183 //border.width: 1
184- color: "white"
185+ backgroundColor: "white"
186 clip: true
187 height: units.gu(3)
188 width: parent.width
189- image: ses
190+ source: ses
191 }
192
193 ShaderEffectSource {
194
195=== modified file 'plugins/about/StorageItem.qml'
196--- plugins/about/StorageItem.qml 2014-10-24 20:04:30 +0000
197+++ plugins/about/StorageItem.qml 2015-08-14 14:39:53 +0000
198@@ -1,5 +1,5 @@
199-import QtQuick 2.0
200-import Ubuntu.Components 0.1
201+import QtQuick 2.4
202+import Ubuntu.Components 1.3
203
204 Item {
205 property string label
206@@ -17,7 +17,7 @@
207 anchors.verticalCenter: parent.verticalCenter
208 width: units.gu(3)
209 height: units.gu(2)
210- color: colorName
211+ backgroundColor: colorName
212 }
213 Label { text: label }
214 }
215
216=== modified file 'plugins/about/Version.qml'
217--- plugins/about/Version.qml 2015-07-13 18:26:10 +0000
218+++ plugins/about/Version.qml 2015-08-14 14:39:53 +0000
219@@ -22,11 +22,11 @@
220 *
221 */
222
223-import QtQuick 2.0
224+import QtQuick 2.4
225 import Qt.labs.folderlistmodel 1.0
226 import SystemSettings 1.0
227-import Ubuntu.Components 0.1
228-import Ubuntu.Components.ListItems 0.1 as ListItem
229+import Ubuntu.Components 1.3
230+import Ubuntu.Components.ListItems 1.3 as ListItem
231 import Ubuntu.SystemSettings.StorageAbout 1.0
232 import Ubuntu.SystemSettings.Update 1.0
233
234
235=== modified file 'plugins/background/Components/AddRemove.qml'
236--- plugins/background/Components/AddRemove.qml 2014-09-22 17:11:10 +0000
237+++ plugins/background/Components/AddRemove.qml 2015-08-14 14:39:53 +0000
238@@ -18,9 +18,9 @@
239 *
240 */
241
242-import QtQuick 2.0
243+import QtQuick 2.4
244 import SystemSettings 1.0
245-import Ubuntu.Components 0.1
246+import Ubuntu.Components 1.3
247 import "../utilities.js" as Utilities
248
249 Row {
250
251=== modified file 'plugins/background/Components/HighlightedOverlay.qml'
252--- plugins/background/Components/HighlightedOverlay.qml 2014-07-04 12:00:55 +0000
253+++ plugins/background/Components/HighlightedOverlay.qml 2015-08-14 14:39:53 +0000
254@@ -18,8 +18,8 @@
255 *
256 */
257
258-import QtQuick 2.0
259-import Ubuntu.Components 0.1
260+import QtQuick 2.4
261+import Ubuntu.Components 1.3
262
263 Rectangle {
264 border.width: units.gu(1)
265
266=== modified file 'plugins/background/Components/ListItemsHeader.qml'
267--- plugins/background/Components/ListItemsHeader.qml 2014-06-30 15:37:42 +0000
268+++ plugins/background/Components/ListItemsHeader.qml 2015-08-14 14:39:53 +0000
269@@ -14,9 +14,9 @@
270 * along with this program. If not, see <http://www.gnu.org/licenses/>.
271 */
272
273-import QtQuick 2.0
274-import Ubuntu.Components 0.1
275-import Ubuntu.Components.ListItems 0.1 as ListItem
276+import QtQuick 2.4
277+import Ubuntu.Components 1.3
278+import Ubuntu.Components.ListItems 1.3 as ListItem
279
280 Item {
281 property alias text: label.text
282
283=== modified file 'plugins/background/Components/OverlayImage.qml'
284--- plugins/background/Components/OverlayImage.qml 2014-07-04 12:02:53 +0000
285+++ plugins/background/Components/OverlayImage.qml 2015-08-14 14:39:53 +0000
286@@ -18,8 +18,8 @@
287 *
288 */
289
290-import QtQuick 2.0
291-import Ubuntu.Components 0.1
292+import QtQuick 2.4
293+import Ubuntu.Components 1.3
294
295 Item {
296 id: overlayImage
297
298=== modified file 'plugins/background/Components/SelectedOverlay.qml'
299--- plugins/background/Components/SelectedOverlay.qml 2014-06-30 15:37:42 +0000
300+++ plugins/background/Components/SelectedOverlay.qml 2015-08-14 14:39:53 +0000
301@@ -18,7 +18,7 @@
302 *
303 */
304
305-import QtQuick 2.0
306+import QtQuick 2.4
307
308 Image {
309 anchors.right: parent.right
310
311=== modified file 'plugins/background/MainPage.qml'
312--- plugins/background/MainPage.qml 2015-03-16 13:51:36 +0000
313+++ plugins/background/MainPage.qml 2015-08-14 14:39:53 +0000
314@@ -18,13 +18,13 @@
315 *
316 */
317
318-import QtQuick 2.0
319+import QtQuick 2.4
320 import GSettings 1.0
321 import SystemSettings 1.0
322 import Ubuntu.Content 0.1
323-import Ubuntu.Components 0.1
324-import Ubuntu.Components.ListItems 0.1 as ListItem
325-import Ubuntu.Components.Popups 0.1
326+import Ubuntu.Components 1.3
327+import Ubuntu.Components.ListItems 1.3 as ListItem
328+import Ubuntu.Components.Popups 1.3
329 import Ubuntu.SystemSettings.Background 1.0
330 import "utilities.js" as Utilities
331
332
333=== modified file 'plugins/background/Preview.qml'
334--- plugins/background/Preview.qml 2014-09-25 17:08:33 +0000
335+++ plugins/background/Preview.qml 2015-08-14 14:39:53 +0000
336@@ -18,10 +18,10 @@
337 *
338 */
339
340-import QtQuick 2.0
341+import QtQuick 2.4
342 import SystemSettings 1.0
343-import Ubuntu.Components 0.1
344-import Ubuntu.Components.ListItems 0.1 as ListItem
345+import Ubuntu.Components 1.3
346+import Ubuntu.Components.ListItems 1.3 as ListItem
347
348 ItemPage {
349 id: preview
350@@ -35,7 +35,6 @@
351 property Item headerStyle: header.__styleInstance ?
352 header.__styleInstance : null
353
354- tools: null
355 Component.onCompleted: {
356 /* change the header text color to make it more readable over the background */
357 if (headerStyle.hasOwnProperty("textColor"))
358
359=== modified file 'plugins/background/WallpaperGrid.qml'
360--- plugins/background/WallpaperGrid.qml 2014-09-05 13:33:21 +0000
361+++ plugins/background/WallpaperGrid.qml 2015-08-14 14:39:53 +0000
362@@ -18,10 +18,10 @@
363 *
364 */
365
366-import QtQuick 2.0
367-import Ubuntu.Components 0.1
368-import Ubuntu.Components.ListItems 0.1 as ListItem
369-import Ubuntu.Components.Popups 0.1
370+import QtQuick 2.4
371+import Ubuntu.Components 1.3
372+import Ubuntu.Components.ListItems 1.3 as ListItem
373+import Ubuntu.Components.Popups 1.3
374 import "Components"
375 import "utilities.js" as Utilities
376
377
378=== modified file 'plugins/battery/PageComponent.qml'
379--- plugins/battery/PageComponent.qml 2015-08-10 20:04:29 +0000
380+++ plugins/battery/PageComponent.qml 2015-08-14 14:39:53 +0000
381@@ -20,11 +20,11 @@
382
383 import GSettings 1.0
384 import QMenuModel 0.1
385-import QtQuick 2.0
386+import QtQuick 2.4
387 import QtSystemInfo 5.0
388 import SystemSettings 1.0
389-import Ubuntu.Components 0.1
390-import Ubuntu.Components.ListItems 0.1 as ListItem
391+import Ubuntu.Components 1.3
392+import Ubuntu.Components.ListItems 1.3 as ListItem
393 import Ubuntu.SystemSettings.Battery 1.0
394 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
395 import Ubuntu.Settings.Components 0.1 as USC
396
397=== modified file 'plugins/battery/SleepValues.qml'
398--- plugins/battery/SleepValues.qml 2015-08-05 16:22:55 +0000
399+++ plugins/battery/SleepValues.qml 2015-08-14 14:39:53 +0000
400@@ -22,9 +22,9 @@
401 // IF YOU RENAME IT YOU MUST UPDATE THE REFERENCE THERE.
402
403 import GSettings 1.0
404-import QtQuick 2.0
405-import Ubuntu.Components 0.1
406-import Ubuntu.Components.ListItems 0.1 as ListItem
407+import QtQuick 2.4
408+import Ubuntu.Components 1.3
409+import Ubuntu.Components.ListItems 1.3 as ListItem
410 import SystemSettings 1.0
411 import Ubuntu.SystemSettings.Battery 1.0
412
413
414=== modified file 'plugins/bluetooth/ConfirmPasskeyDialog.qml'
415--- plugins/bluetooth/ConfirmPasskeyDialog.qml 2013-09-30 15:37:50 +0000
416+++ plugins/bluetooth/ConfirmPasskeyDialog.qml 2015-08-14 14:39:53 +0000
417@@ -19,9 +19,9 @@
418 */
419
420
421-import QtQuick 2.0
422-import Ubuntu.Components 0.1
423-import Ubuntu.Components.Popups 0.1
424+import QtQuick 2.4
425+import Ubuntu.Components 1.3
426+import Ubuntu.Components.Popups 1.3
427
428 Dialog {
429 id: root
430
431=== modified file 'plugins/bluetooth/DisplayPasskeyDialog.qml'
432--- plugins/bluetooth/DisplayPasskeyDialog.qml 2015-02-13 10:30:37 +0000
433+++ plugins/bluetooth/DisplayPasskeyDialog.qml 2015-08-14 14:39:53 +0000
434@@ -17,9 +17,9 @@
435 */
436
437
438-import QtQuick 2.0
439-import Ubuntu.Components 0.1
440-import Ubuntu.Components.Popups 0.1
441+import QtQuick 2.4
442+import Ubuntu.Components 1.3
443+import Ubuntu.Components.Popups 1.3
444
445 Dialog {
446 id: root
447
448=== modified file 'plugins/bluetooth/PageComponent.qml'
449--- plugins/bluetooth/PageComponent.qml 2015-08-06 16:35:22 +0000
450+++ plugins/bluetooth/PageComponent.qml 2015-08-14 14:39:53 +0000
451@@ -19,11 +19,11 @@
452 */
453
454 import QMenuModel 0.1
455-import QtQuick 2.0
456+import QtQuick 2.4
457 import SystemSettings 1.0
458-import Ubuntu.Components 0.1
459-import Ubuntu.Components.Popups 0.1
460-import Ubuntu.Components.ListItems 0.1 as ListItem
461+import Ubuntu.Components 1.3
462+import Ubuntu.Components.Popups 1.3
463+import Ubuntu.Components.ListItems 1.3 as ListItem
464 import Ubuntu.SystemSettings.Bluetooth 1.0
465 import Ubuntu.Settings.Components 0.1 as USC
466
467
468=== modified file 'plugins/bluetooth/ProvidePasskeyDialog.qml'
469--- plugins/bluetooth/ProvidePasskeyDialog.qml 2015-03-11 14:52:19 +0000
470+++ plugins/bluetooth/ProvidePasskeyDialog.qml 2015-08-14 14:39:53 +0000
471@@ -19,9 +19,9 @@
472 */
473
474
475-import QtQuick 2.0
476-import Ubuntu.Components 0.1
477-import Ubuntu.Components.Popups 0.1
478+import QtQuick 2.4
479+import Ubuntu.Components 1.3
480+import Ubuntu.Components.Popups 1.3
481
482 Dialog {
483 id: root
484
485=== modified file 'plugins/bluetooth/ProvidePinCodeDialog.qml'
486--- plugins/bluetooth/ProvidePinCodeDialog.qml 2015-03-11 14:52:19 +0000
487+++ plugins/bluetooth/ProvidePinCodeDialog.qml 2015-08-14 14:39:53 +0000
488@@ -19,9 +19,9 @@
489 */
490
491
492-import QtQuick 2.0
493-import Ubuntu.Components 0.1
494-import Ubuntu.Components.Popups 0.1
495+import QtQuick 2.4
496+import Ubuntu.Components 1.3
497+import Ubuntu.Components.Popups 1.3
498
499 Dialog {
500 id: root
501
502=== modified file 'plugins/brightness/PageComponent.qml'
503--- plugins/brightness/PageComponent.qml 2015-04-07 10:46:52 +0000
504+++ plugins/brightness/PageComponent.qml 2015-08-14 14:39:53 +0000
505@@ -19,10 +19,10 @@
506 */
507
508 import GSettings 1.0
509-import QtQuick 2.0
510+import QtQuick 2.4
511 import SystemSettings 1.0
512-import Ubuntu.Components 0.1
513-import Ubuntu.Components.ListItems 0.1 as ListItem
514+import Ubuntu.Components 1.3
515+import Ubuntu.Components.ListItems 1.3 as ListItem
516 import Ubuntu.SystemSettings.Brightness 1.0
517 import Ubuntu.Settings.Menus 0.1 as Menus
518 import Ubuntu.Settings.Components 0.1 as USC
519
520=== modified file 'plugins/cellular/Common.qml'
521--- plugins/cellular/Common.qml 2015-05-15 14:19:20 +0000
522+++ plugins/cellular/Common.qml 2015-08-14 14:39:53 +0000
523@@ -17,7 +17,7 @@
524 * Jonas G. Drange <jonas.drange@canonical.com>
525 *
526 */
527-import QtQuick 2.0
528+import QtQuick 2.4
529
530 Item {
531 /*
532
533=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
534--- plugins/cellular/Components/DataMultiSim.qml 2015-01-20 12:23:34 +0000
535+++ plugins/cellular/Components/DataMultiSim.qml 2015-08-14 14:39:53 +0000
536@@ -17,10 +17,10 @@
537 * Jonas G. Drange <jonas.drange@canonical.com>
538 *
539 */
540-import QtQuick 2.0
541+import QtQuick 2.4
542 import SystemSettings 1.0
543-import Ubuntu.Components 0.1
544-import Ubuntu.Components.ListItems 0.1 as ListItem
545+import Ubuntu.Components 1.3
546+import Ubuntu.Components.ListItems 1.3 as ListItem
547
548 Column {
549
550
551=== modified file 'plugins/cellular/Components/DefaultSim.qml'
552--- plugins/cellular/Components/DefaultSim.qml 2014-10-31 18:14:35 +0000
553+++ plugins/cellular/Components/DefaultSim.qml 2015-08-14 14:39:53 +0000
554@@ -17,10 +17,10 @@
555 * Jonas G. Drange <jonas.drange@canonical.com>
556 *
557 */
558-import QtQuick 2.0
559+import QtQuick 2.4
560 import SystemSettings 1.0
561-import Ubuntu.Components 0.1
562-import Ubuntu.Components.ListItems 0.1 as ListItem
563+import Ubuntu.Components 1.3
564+import Ubuntu.Components.ListItems 1.3 as ListItem
565
566 Column {
567
568
569=== modified file 'plugins/cellular/Components/KeyboardRectangle.qml'
570--- plugins/cellular/Components/KeyboardRectangle.qml 2015-05-08 09:22:05 +0000
571+++ plugins/cellular/Components/KeyboardRectangle.qml 2015-08-14 14:39:53 +0000
572@@ -14,7 +14,7 @@
573 * along with this program. If not, see <http://www.gnu.org/licenses/>.
574 */
575
576-import QtQuick 2.2
577+import QtQuick 2.4
578
579 Item {
580 id: keyboardRect
581
582=== modified file 'plugins/cellular/Components/LabelTextField.qml'
583--- plugins/cellular/Components/LabelTextField.qml 2015-05-19 15:09:41 +0000
584+++ plugins/cellular/Components/LabelTextField.qml 2015-08-14 14:39:53 +0000
585@@ -16,9 +16,9 @@
586 * with this program. If not, see <http://www.gnu.org/licenses/>.
587 */
588
589-import QtQuick 2.0
590-import Ubuntu.Components 1.1
591-import Ubuntu.Components.Themes.Ambiance 0.1
592+import QtQuick 2.4
593+import Ubuntu.Components 1.3
594+import Ubuntu.Components.Themes.Ambiance 1.3
595 import Ubuntu.Keyboard 0.1
596 import SystemSettings 1.0
597
598
599=== modified file 'plugins/cellular/Components/MultiSim.qml'
600--- plugins/cellular/Components/MultiSim.qml 2015-07-24 20:00:06 +0000
601+++ plugins/cellular/Components/MultiSim.qml 2015-08-14 14:39:53 +0000
602@@ -17,11 +17,11 @@
603 * Jonas G. Drange <jonas.drange@canonical.com>
604 *
605 */
606-import QtQuick 2.0
607+import QtQuick 2.4
608 import GSettings 1.0
609 import SystemSettings 1.0
610-import Ubuntu.Components 0.1
611-import Ubuntu.Components.ListItems 0.1 as ListItem
612+import Ubuntu.Components 1.3
613+import Ubuntu.Components.ListItems 1.3 as ListItem
614
615 /* This is a temporary solution to the issue of Hotspots failing on mako. If
616 the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
617
618=== modified file 'plugins/cellular/Components/NoSim.qml'
619--- plugins/cellular/Components/NoSim.qml 2015-02-13 09:50:19 +0000
620+++ plugins/cellular/Components/NoSim.qml 2015-08-14 14:39:53 +0000
621@@ -17,8 +17,8 @@
622 * Jonas G. Drange <jonas.drange@canonical.com>
623 *
624 */
625-import QtQuick 2.0
626-import Ubuntu.Components 1.1
627+import QtQuick 2.4
628+import Ubuntu.Components 1.3
629
630 Column {
631
632
633=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
634--- plugins/cellular/Components/RadioSingleSim.qml 2015-01-21 20:44:20 +0000
635+++ plugins/cellular/Components/RadioSingleSim.qml 2015-08-14 14:39:53 +0000
636@@ -17,10 +17,10 @@
637 * Jonas G. Drange <jonas.drange@canonical.com>
638 *
639 */
640-import QtQuick 2.0
641+import QtQuick 2.4
642 import SystemSettings 1.0
643-import Ubuntu.Components 0.1
644-import Ubuntu.Components.ListItems 0.1 as ListItem
645+import Ubuntu.Components 1.3
646+import Ubuntu.Components.ListItems 1.3 as ListItem
647
648 Column {
649 id: radioSingleSim
650
651=== modified file 'plugins/cellular/Components/Sim.qml'
652--- plugins/cellular/Components/Sim.qml 2015-01-21 20:44:20 +0000
653+++ plugins/cellular/Components/Sim.qml 2015-08-14 14:39:53 +0000
654@@ -17,7 +17,7 @@
655 * Jonas G. Drange <jonas.drange@canonical.com>
656 *
657 */
658-import QtQuick 2.0
659+import QtQuick 2.4
660 import MeeGo.QOfono 0.2
661
662 Item {
663
664=== modified file 'plugins/cellular/Components/SimEditor.qml'
665--- plugins/cellular/Components/SimEditor.qml 2014-10-31 18:14:35 +0000
666+++ plugins/cellular/Components/SimEditor.qml 2015-08-14 14:39:53 +0000
667@@ -17,10 +17,10 @@
668 * Jonas G. Drange <jonas.drange@canonical.com>
669 *
670 */
671-import QtQuick 2.0
672+import QtQuick 2.4
673 import SystemSettings 1.0
674-import Ubuntu.Components 1.1
675-import Ubuntu.Components.ListItems 0.1 as ListItem
676+import Ubuntu.Components 1.3
677+import Ubuntu.Components.ListItems 1.3 as ListItem
678
679 Column {
680 id: simList
681
682=== modified file 'plugins/cellular/Components/SingleSim.qml'
683--- plugins/cellular/Components/SingleSim.qml 2015-07-24 20:00:06 +0000
684+++ plugins/cellular/Components/SingleSim.qml 2015-08-14 14:39:53 +0000
685@@ -17,10 +17,10 @@
686 * Jonas G. Drange <jonas.drange@canonical.com>
687 *
688 */
689-import QtQuick 2.0
690+import QtQuick 2.4
691 import SystemSettings 1.0
692-import Ubuntu.Components 0.1
693-import Ubuntu.Components.ListItems 0.1 as ListItem
694+import Ubuntu.Components 1.3
695+import Ubuntu.Components.ListItems 1.3 as ListItem
696
697 /* This is a temporary solution to the issue of Hotspots failing on mako. If
698 the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
699
700=== modified file 'plugins/cellular/Components/StandardAnimation.qml'
701--- plugins/cellular/Components/StandardAnimation.qml 2015-05-08 09:22:05 +0000
702+++ plugins/cellular/Components/StandardAnimation.qml 2015-08-14 14:39:53 +0000
703@@ -14,7 +14,7 @@
704 * along with this program. If not, see <http://www.gnu.org/licenses/>.
705 */
706
707-import QtQuick 2.2
708+import QtQuick 2.4
709
710 NumberAnimation {
711 duration: 300
712
713=== modified file 'plugins/cellular/Hotspot.qml'
714--- plugins/cellular/Hotspot.qml 2015-08-10 20:04:29 +0000
715+++ plugins/cellular/Hotspot.qml 2015-08-14 14:39:53 +0000
716@@ -16,11 +16,11 @@
717 * with this program. If not, see <http://www.gnu.org/licenses/>.
718 */
719
720-import QtQuick 2.0
721+import QtQuick 2.4
722 import SystemSettings 1.0
723-import Ubuntu.Components 0.1
724-import Ubuntu.Components.ListItems 0.1 as ListItem
725-import Ubuntu.Components.Popups 0.1
726+import Ubuntu.Components 1.3
727+import Ubuntu.Components.ListItems 1.3 as ListItem
728+import Ubuntu.Components.Popups 1.3
729 import Ubuntu.Connectivity 1.0
730 import Ubuntu.Settings.Components 0.1 as USC
731 import Ubuntu.SystemSettings.Cellular 1.0
732
733=== modified file 'plugins/cellular/HotspotSetup.qml'
734--- plugins/cellular/HotspotSetup.qml 2015-08-10 20:04:29 +0000
735+++ plugins/cellular/HotspotSetup.qml 2015-08-14 14:39:53 +0000
736@@ -16,14 +16,14 @@
737 * with this program. If not, see <http://www.gnu.org/licenses/>.
738 */
739
740-import QtQuick 2.0
741+import QtQuick 2.4
742 import QtQuick.Layouts 1.1
743 import SystemSettings 1.0
744-import Ubuntu.Components 0.1
745-import Ubuntu.Components.ListItems 0.1 as ListItem
746+import Ubuntu.Components 1.3
747+import Ubuntu.Components.ListItems 1.3 as ListItem
748+import Ubuntu.Components.Popups 1.3
749 import Ubuntu.Connectivity 1.0
750 import Ubuntu.SystemSettings.Cellular 1.0
751-import Ubuntu.Components.Popups 0.1
752
753 Component {
754 id: hotspotSetup
755
756=== modified file 'plugins/cellular/PageApnEditor.qml'
757--- plugins/cellular/PageApnEditor.qml 2015-07-07 14:16:04 +0000
758+++ plugins/cellular/PageApnEditor.qml 2015-08-14 14:39:53 +0000
759@@ -19,11 +19,11 @@
760 * with this program. If not, see <http://www.gnu.org/licenses/>.
761 */
762
763-import QtQuick 2.0
764+import QtQuick 2.4
765 import SystemSettings 1.0
766-import Ubuntu.Components 1.1
767-import Ubuntu.Components.Popups 1.0
768-import Ubuntu.Components.ListItems 1.0 as ListItem
769+import Ubuntu.Components 1.3
770+import Ubuntu.Components.Popups 1.3
771+import Ubuntu.Components.ListItems 1.3 as ListItem
772 import MeeGo.QOfono 0.2
773 import "Components" as LocalComponents
774 import "apn_editor.js" as Editor
775
776=== modified file 'plugins/cellular/PageCarrierAndApn.qml'
777--- plugins/cellular/PageCarrierAndApn.qml 2015-03-27 10:01:48 +0000
778+++ plugins/cellular/PageCarrierAndApn.qml 2015-08-14 14:39:53 +0000
779@@ -17,10 +17,10 @@
780 * Jonas G. Drange <jonas.drange@canonical.com>
781 *
782 */
783-import QtQuick 2.0
784+import QtQuick 2.4
785 import SystemSettings 1.0
786-import Ubuntu.Components 0.1
787-import Ubuntu.Components.ListItems 0.1 as ListItem
788+import Ubuntu.Components 1.3
789+import Ubuntu.Components.ListItems 1.3 as ListItem
790
791 ItemPage {
792 id: root
793
794=== modified file 'plugins/cellular/PageCarriersAndApns.qml'
795--- plugins/cellular/PageCarriersAndApns.qml 2015-03-27 10:01:48 +0000
796+++ plugins/cellular/PageCarriersAndApns.qml 2015-08-14 14:39:53 +0000
797@@ -17,10 +17,10 @@
798 * Jonas G. Drange <jonas.drange@canonical.com>
799 *
800 */
801-import QtQuick 2.0
802+import QtQuick 2.4
803 import SystemSettings 1.0
804-import Ubuntu.Components 0.1
805-import Ubuntu.Components.ListItems 0.1 as ListItem
806+import Ubuntu.Components 1.3
807+import Ubuntu.Components.ListItems 1.3 as ListItem
808
809 ItemPage {
810 id: root
811
812=== modified file 'plugins/cellular/PageChooseApn.qml'
813--- plugins/cellular/PageChooseApn.qml 2015-06-08 14:25:13 +0000
814+++ plugins/cellular/PageChooseApn.qml 2015-08-14 14:39:53 +0000
815@@ -23,11 +23,11 @@
816 *
817 */
818
819-import QtQuick 2.0
820+import QtQuick 2.4
821 import SystemSettings 1.0
822-import Ubuntu.Components 1.1
823-import Ubuntu.Components.Popups 1.0
824-import Ubuntu.Components.ListItems 1.0 as ListItem
825+import Ubuntu.Components 1.3
826+import Ubuntu.Components.Popups 1.3
827+import Ubuntu.Components.ListItems 1.3 as ListItem
828 import MeeGo.QOfono 0.2
829 import Ubuntu.SystemSettings.Cellular 1.0
830 import "apn_manager.js" as Manager
831
832=== modified file 'plugins/cellular/PageChooseCarrier.qml'
833--- plugins/cellular/PageChooseCarrier.qml 2014-12-05 15:47:24 +0000
834+++ plugins/cellular/PageChooseCarrier.qml 2015-08-14 14:39:53 +0000
835@@ -19,11 +19,11 @@
836 * with this program. If not, see <http://www.gnu.org/licenses/>.
837 */
838
839-import QtQuick 2.0
840+import QtQuick 2.4
841 import QtQuick.Layouts 1.1
842 import SystemSettings 1.0
843-import Ubuntu.Components 1.1
844-import Ubuntu.Components.ListItems 1.0 as ListItem
845+import Ubuntu.Components 1.3
846+import Ubuntu.Components.ListItems 1.3 as ListItem
847 import MeeGo.QOfono 0.2
848 import "carriers.js" as CHelper
849
850
851=== modified file 'plugins/cellular/PageComponent.qml'
852--- plugins/cellular/PageComponent.qml 2015-07-24 20:00:06 +0000
853+++ plugins/cellular/PageComponent.qml 2015-08-14 14:39:53 +0000
854@@ -18,11 +18,11 @@
855 * with this program. If not, see <http://www.gnu.org/licenses/>.
856 */
857
858-import QtQuick 2.0
859+import QtQuick 2.4
860 import SystemSettings 1.0
861 import Ubuntu.SystemSettings.Cellular 1.0
862-import Ubuntu.Components 0.1
863-import Ubuntu.Components.ListItems 0.1 as ListItem
864+import Ubuntu.Components 1.3
865+import Ubuntu.Components.ListItems 1.3 as ListItem
866 import MeeGo.QOfono 0.2
867 import QMenuModel 0.1
868 import "Components" as LocalComponents
869
870=== modified file 'plugins/example/PageComponent.qml'
871--- plugins/example/PageComponent.qml 2013-05-30 08:06:10 +0000
872+++ plugins/example/PageComponent.qml 2015-08-14 14:39:53 +0000
873@@ -18,8 +18,8 @@
874 * with this program. If not, see <http://www.gnu.org/licenses/>.
875 */
876
877-import QtQuick 2.0
878-import Ubuntu.Components 0.1
879+import QtQuick 2.4
880+import Ubuntu.Components 1.3
881 import SystemSettings 1.0
882
883 ItemPage {
884
885=== modified file 'plugins/flight-mode/EntryComponent.qml'
886--- plugins/flight-mode/EntryComponent.qml 2015-03-20 12:11:57 +0000
887+++ plugins/flight-mode/EntryComponent.qml 2015-08-14 14:39:53 +0000
888@@ -18,9 +18,9 @@
889 * with this program. If not, see <http://www.gnu.org/licenses/>.
890 */
891
892-import QtQuick 2.0
893-import Ubuntu.Components 0.1
894-import Ubuntu.Components.ListItems 0.1 as ListItem
895+import QtQuick 2.4
896+import Ubuntu.Components 1.3
897+import Ubuntu.Components.ListItems 1.3 as ListItem
898 import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
899 import Ubuntu.Settings.Components 0.1 as USC
900
901
902=== modified file 'plugins/language/DisplayLanguage.qml'
903--- plugins/language/DisplayLanguage.qml 2014-10-28 16:10:46 +0000
904+++ plugins/language/DisplayLanguage.qml 2015-08-14 14:39:53 +0000
905@@ -18,10 +18,10 @@
906 * with this program. If not, see <http://www.gnu.org/licenses/>.
907 */
908
909-import QtQuick 2.0
910-import Ubuntu.Components 0.1
911-import Ubuntu.Components.Popups 0.1
912-import Ubuntu.Components.ListItems 0.1 as ListItem
913+import QtQuick 2.4
914+import Ubuntu.Components 1.3
915+import Ubuntu.Components.Popups 1.3
916+import Ubuntu.Components.ListItems 1.3 as ListItem
917 import Ubuntu.SystemSettings.LanguagePlugin 1.0
918
919 SheetBase {
920
921=== modified file 'plugins/language/KeyboardLayoutItem.qml'
922--- plugins/language/KeyboardLayoutItem.qml 2013-11-28 16:28:54 +0000
923+++ plugins/language/KeyboardLayoutItem.qml 2015-08-14 14:39:53 +0000
924@@ -18,9 +18,9 @@
925 * with this program. If not, see <http://www.gnu.org/licenses/>.
926 */
927
928-import QtQuick 2.0
929-import Ubuntu.Components 0.1
930-import Ubuntu.Components.ListItems 0.1 as ListItem
931+import QtQuick 2.4
932+import Ubuntu.Components 1.3
933+import Ubuntu.Components.ListItems 1.3 as ListItem
934
935 ListItem.Base {
936 property alias name: name.text
937
938=== modified file 'plugins/language/KeyboardLayouts.qml'
939--- plugins/language/KeyboardLayouts.qml 2013-11-28 16:28:54 +0000
940+++ plugins/language/KeyboardLayouts.qml 2015-08-14 14:39:53 +0000
941@@ -19,7 +19,7 @@
942 */
943
944 import SystemSettings 1.0
945-import Ubuntu.Components.ListItems 0.1 as ListItem
946+import Ubuntu.Components.ListItems 1.3 as ListItem
947 import Ubuntu.SystemSettings.LanguagePlugin 1.0
948
949 ItemPage {
950
951=== modified file 'plugins/language/PageComponent.qml'
952--- plugins/language/PageComponent.qml 2015-05-21 13:47:55 +0000
953+++ plugins/language/PageComponent.qml 2015-08-14 14:39:53 +0000
954@@ -18,12 +18,12 @@
955 * with this program. If not, see <http://www.gnu.org/licenses/>.
956 */
957
958-import QtQuick 2.0
959+import QtQuick 2.4
960 import GSettings 1.0
961 import SystemSettings 1.0
962-import Ubuntu.Components 0.1
963-import Ubuntu.Components.Popups 0.1
964-import Ubuntu.Components.ListItems 0.1 as ListItem
965+import Ubuntu.Components 1.3
966+import Ubuntu.Components.Popups 1.3
967+import Ubuntu.Components.ListItems 1.3 as ListItem
968 import Ubuntu.Settings.Menus 0.1 as Menus
969 import Ubuntu.SystemSettings.LanguagePlugin 1.0
970
971
972=== modified file 'plugins/language/RebootNecessary.qml'
973--- plugins/language/RebootNecessary.qml 2014-09-03 15:18:38 +0000
974+++ plugins/language/RebootNecessary.qml 2015-08-14 14:39:53 +0000
975@@ -18,9 +18,9 @@
976 * with this program. If not, see <http://www.gnu.org/licenses/>.
977 */
978
979-import QtQuick 2.0
980-import Ubuntu.Components 0.1
981-import Ubuntu.Components.Popups 0.1
982+import QtQuick 2.4
983+import Ubuntu.Components 1.3
984+import Ubuntu.Components.Popups 1.3
985
986 Dialog {
987 id: dialog
988
989=== modified file 'plugins/language/SpellChecking.qml'
990--- plugins/language/SpellChecking.qml 2014-11-04 14:42:49 +0000
991+++ plugins/language/SpellChecking.qml 2015-08-14 14:39:53 +0000
992@@ -18,11 +18,11 @@
993 * with this program. If not, see <http://www.gnu.org/licenses/>.
994 */
995
996-import QtQuick 2.0
997+import QtQuick 2.4
998 import GSettings 1.0
999 import SystemSettings 1.0
1000-import Ubuntu.Components 0.1
1001-import Ubuntu.Components.ListItems 0.1 as ListItem
1002+import Ubuntu.Components 1.3
1003+import Ubuntu.Components.ListItems 1.3 as ListItem
1004 import Ubuntu.SystemSettings.LanguagePlugin 1.0
1005
1006 ItemPage {
1007
1008=== modified file 'plugins/language/SubsetView.qml'
1009--- plugins/language/SubsetView.qml 2014-09-08 13:04:38 +0000
1010+++ plugins/language/SubsetView.qml 2015-08-14 14:39:53 +0000
1011@@ -18,10 +18,10 @@
1012 * with this program. If not, see <http://www.gnu.org/licenses/>.
1013 */
1014
1015-import QtQuick 2.0
1016+import QtQuick 2.4
1017 import SystemSettings 1.0
1018-import Ubuntu.Components 0.1
1019-import Ubuntu.Components.ListItems 0.1 as ListItem
1020+import Ubuntu.Components 1.3
1021+import Ubuntu.Components.ListItems 1.3 as ListItem
1022
1023 ListView {
1024 id: root
1025
1026=== modified file 'plugins/notifications/PageComponent.qml'
1027--- plugins/notifications/PageComponent.qml 2014-11-04 20:49:18 +0000
1028+++ plugins/notifications/PageComponent.qml 2015-08-14 14:39:53 +0000
1029@@ -16,9 +16,9 @@
1030 * with this program. If not, see <http://www.gnu.org/licenses/>.
1031 */
1032
1033-import QtQuick 2.0
1034-import Ubuntu.Components 0.1
1035-import Ubuntu.Components.ListItems 0.1 as ListItem
1036+import QtQuick 2.4
1037+import Ubuntu.Components 1.3
1038+import Ubuntu.Components.ListItems 1.3 as ListItem
1039 import Ubuntu.SystemSettings.Notifications 1.0
1040 import SystemSettings 1.0
1041
1042
1043=== modified file 'plugins/orientation-lock/EntryComponent.qml'
1044--- plugins/orientation-lock/EntryComponent.qml 2014-11-04 12:04:16 +0000
1045+++ plugins/orientation-lock/EntryComponent.qml 2015-08-14 14:39:53 +0000
1046@@ -19,10 +19,10 @@
1047 */
1048
1049 import GSettings 1.0
1050-import QtQuick 2.0
1051+import QtQuick 2.4
1052 import QtQuick.Window 2.1
1053-import Ubuntu.Components 0.1
1054-import Ubuntu.Components.ListItems 0.1 as ListItem
1055+import Ubuntu.Components 1.3
1056+import Ubuntu.Components.ListItems 1.3 as ListItem
1057
1058
1059 ListItem.Standard {
1060
1061=== modified file 'plugins/phone/CallForwardItem.qml'
1062--- plugins/phone/CallForwardItem.qml 2015-06-30 21:00:45 +0000
1063+++ plugins/phone/CallForwardItem.qml 2015-08-14 14:39:53 +0000
1064@@ -18,9 +18,9 @@
1065 * with this program. If not, see <http://www.gnu.org/licenses/>.
1066 */
1067
1068-import QtQuick 2.0
1069-import Ubuntu.Components 1.1
1070-import Ubuntu.Components.ListItems 0.1 as ListItem
1071+import QtQuick 2.4
1072+import Ubuntu.Components 1.3
1073+import Ubuntu.Components.ListItems 1.3 as ListItem
1074 import Ubuntu.Components.Themes.Ambiance 0.1
1075 import MeeGo.QOfono 0.2
1076 import "callForwardingUtils.js" as Utils
1077
1078=== modified file 'plugins/phone/CallForwarding.qml'
1079--- plugins/phone/CallForwarding.qml 2015-07-02 22:42:12 +0000
1080+++ plugins/phone/CallForwarding.qml 2015-08-14 14:39:53 +0000
1081@@ -26,12 +26,12 @@
1082 * “Contact {carrier name} for more information.”.
1083 */
1084
1085-import QtQuick 2.0
1086+import QtQuick 2.4
1087 import QtContacts 5.0
1088 import SystemSettings 1.0
1089-import Ubuntu.Components 1.1
1090-import Ubuntu.Components.ListItems 0.1 as ListItem
1091-import Ubuntu.Components.Popups 0.1
1092+import Ubuntu.Components 1.3
1093+import Ubuntu.Components.ListItems 1.3 as ListItem
1094+import Ubuntu.Components.Popups 1.3
1095 import Ubuntu.Components.Themes.Ambiance 0.1
1096 import Ubuntu.Content 0.1
1097 import "callForwardingUtils.js" as Utils
1098
1099=== modified file 'plugins/phone/CallWaiting.qml'
1100--- plugins/phone/CallWaiting.qml 2015-07-06 15:15:05 +0000
1101+++ plugins/phone/CallWaiting.qml 2015-08-14 14:39:53 +0000
1102@@ -18,10 +18,10 @@
1103 * with this program. If not, see <http://www.gnu.org/licenses/>.
1104 */
1105
1106-import QtQuick 2.0
1107+import QtQuick 2.4
1108 import SystemSettings 1.0
1109-import Ubuntu.Components 0.1
1110-import Ubuntu.Components.ListItems 0.1 as ListItem
1111+import Ubuntu.Components 1.3
1112+import Ubuntu.Components.ListItems 1.3 as ListItem
1113 import MeeGo.QOfono 0.2
1114
1115 ItemPage {
1116
1117=== modified file 'plugins/phone/KeyboardRectangle.qml'
1118--- plugins/phone/KeyboardRectangle.qml 2015-06-15 13:05:17 +0000
1119+++ plugins/phone/KeyboardRectangle.qml 2015-08-14 14:39:53 +0000
1120@@ -14,7 +14,7 @@
1121 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1122 */
1123
1124-import QtQuick 2.2
1125+import QtQuick 2.4
1126
1127 Item {
1128 id: keyboardRect
1129
1130=== modified file 'plugins/phone/MultiSim.qml'
1131--- plugins/phone/MultiSim.qml 2015-07-09 11:54:39 +0000
1132+++ plugins/phone/MultiSim.qml 2015-08-14 14:39:53 +0000
1133@@ -18,11 +18,11 @@
1134 * Jonas G. Drange <jonas.drange@canonical.com>
1135 *
1136 */
1137-import QtQuick 2.0
1138+import QtQuick 2.4
1139 import GSettings 1.0
1140 import SystemSettings 1.0
1141-import Ubuntu.Components 1.1
1142-import Ubuntu.Components.ListItems 0.1 as ListItem
1143+import Ubuntu.Components 1.3
1144+import Ubuntu.Components.ListItems 1.3 as ListItem
1145
1146 Column {
1147
1148
1149=== modified file 'plugins/phone/NoSims.qml'
1150--- plugins/phone/NoSims.qml 2014-08-19 15:59:18 +0000
1151+++ plugins/phone/NoSims.qml 2015-08-14 14:39:53 +0000
1152@@ -18,9 +18,9 @@
1153 * Jonas G. Drange <jonas.drange@canonical.com>
1154 *
1155 */
1156-import QtQuick 2.0
1157-import Ubuntu.Components 1.1
1158-import Ubuntu.Components.ListItems 0.1 as ListItem
1159+import QtQuick 2.4
1160+import Ubuntu.Components 1.3
1161+import Ubuntu.Components.ListItems 1.3 as ListItem
1162
1163 Column {
1164
1165
1166=== modified file 'plugins/phone/Ofono.qml'
1167--- plugins/phone/Ofono.qml 2014-08-23 17:36:04 +0000
1168+++ plugins/phone/Ofono.qml 2015-08-14 14:39:53 +0000
1169@@ -17,7 +17,7 @@
1170 * Jonas G. Drange <jonas.drange@canonical.com>
1171 *
1172 */
1173-import QtQuick 2.0
1174+import QtQuick 2.4
1175 import MeeGo.QOfono 0.2
1176
1177 Item {
1178
1179=== modified file 'plugins/phone/PageComponent.qml'
1180--- plugins/phone/PageComponent.qml 2015-01-29 18:26:44 +0000
1181+++ plugins/phone/PageComponent.qml 2015-08-14 14:39:53 +0000
1182@@ -18,10 +18,10 @@
1183 * with this program. If not, see <http://www.gnu.org/licenses/>.
1184 */
1185
1186-import QtQuick 2.0
1187+import QtQuick 2.4
1188 import SystemSettings 1.0
1189-import Ubuntu.Components 0.1
1190-import Ubuntu.Components.ListItems 0.1 as ListItem
1191+import Ubuntu.Components 1.3
1192+import Ubuntu.Components.ListItems 1.3 as ListItem
1193 import Ubuntu.SystemSettings.Sound 1.0
1194 import MeeGo.QOfono 0.2
1195 import "sims.js" as Sims
1196
1197=== modified file 'plugins/phone/ServiceInfo.qml'
1198--- plugins/phone/ServiceInfo.qml 2015-03-16 13:51:36 +0000
1199+++ plugins/phone/ServiceInfo.qml 2015-08-14 14:39:53 +0000
1200@@ -18,10 +18,10 @@
1201 * with this program. If not, see <http://www.gnu.org/licenses/>.
1202 */
1203
1204-import QtQuick 2.0
1205+import QtQuick 2.4
1206 import SystemSettings 1.0
1207-import Ubuntu.Components 0.1
1208-import Ubuntu.Components.ListItems 0.1 as ListItem
1209+import Ubuntu.Components 1.3
1210+import Ubuntu.Components.ListItems 1.3 as ListItem
1211 import Ubuntu.History 0.1
1212 import "dateUtils.js" as DateUtils
1213
1214
1215=== modified file 'plugins/phone/Services.qml'
1216--- plugins/phone/Services.qml 2015-07-13 12:17:29 +0000
1217+++ plugins/phone/Services.qml 2015-08-14 14:39:53 +0000
1218@@ -18,10 +18,10 @@
1219 * with this program. If not, see <http://www.gnu.org/licenses/>.
1220 */
1221
1222-import QtQuick 2.0
1223+import QtQuick 2.4
1224 import SystemSettings 1.0
1225-import Ubuntu.Components 0.1
1226-import Ubuntu.Components.ListItems 0.1 as ListItem
1227+import Ubuntu.Components 1.3
1228+import Ubuntu.Components.ListItems 1.3 as ListItem
1229
1230 ItemPage {
1231 id: root
1232
1233=== modified file 'plugins/phone/SingleSim.qml'
1234--- plugins/phone/SingleSim.qml 2015-07-09 11:54:39 +0000
1235+++ plugins/phone/SingleSim.qml 2015-08-14 14:39:53 +0000
1236@@ -18,9 +18,9 @@
1237 * Jonas G. Drange <jonas.drange@canonical.com>
1238 *
1239 */
1240-import QtQuick 2.0
1241-import Ubuntu.Components 1.1
1242-import Ubuntu.Components.ListItems 0.1 as ListItem
1243+import QtQuick 2.4
1244+import Ubuntu.Components 1.3
1245+import Ubuntu.Components.ListItems 1.3 as ListItem
1246
1247 Column {
1248
1249
1250=== modified file 'plugins/phone/VCardParser.qml'
1251--- plugins/phone/VCardParser.qml 2015-06-22 13:57:56 +0000
1252+++ plugins/phone/VCardParser.qml 2015-08-14 14:39:53 +0000
1253@@ -14,7 +14,7 @@
1254 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1255 */
1256
1257-import QtQuick 2.2
1258+import QtQuick 2.4
1259 import QtContacts 5.0
1260
1261 QtObject {
1262
1263=== modified file 'plugins/reset/EntryComponent.qml'
1264--- plugins/reset/EntryComponent.qml 2014-07-30 22:16:33 +0000
1265+++ plugins/reset/EntryComponent.qml 2015-08-14 14:39:53 +0000
1266@@ -18,9 +18,9 @@
1267 * with this program. If not, see <http://www.gnu.org/licenses/>.
1268 */
1269
1270-import QtQuick 2.0
1271-import Ubuntu.Components 0.1
1272-import Ubuntu.Components.ListItems 0.1 as ListItem
1273+import QtQuick 2.4
1274+import Ubuntu.Components 1.3
1275+import Ubuntu.Components.ListItems 1.3 as ListItem
1276
1277 ListItem.Standard {
1278 id: root
1279
1280=== modified file 'plugins/reset/EraseEverything.qml'
1281--- plugins/reset/EraseEverything.qml 2014-07-30 22:16:33 +0000
1282+++ plugins/reset/EraseEverything.qml 2015-08-14 14:39:53 +0000
1283@@ -18,9 +18,9 @@
1284 * with this program. If not, see <http://www.gnu.org/licenses/>.
1285 */
1286
1287-import QtQuick 2.0
1288-import Ubuntu.Components 0.1
1289-import Ubuntu.Components.Popups 0.1
1290+import QtQuick 2.4
1291+import Ubuntu.Components 1.3
1292+import Ubuntu.Components.Popups 1.3
1293
1294 Component {
1295 id: eraseEverything
1296
1297=== modified file 'plugins/reset/PageComponent.qml'
1298--- plugins/reset/PageComponent.qml 2014-07-30 22:16:33 +0000
1299+++ plugins/reset/PageComponent.qml 2015-08-14 14:39:53 +0000
1300@@ -19,11 +19,11 @@
1301 */
1302
1303 import GSettings 1.0
1304-import QtQuick 2.0
1305+import QtQuick 2.4
1306 import SystemSettings 1.0
1307-import Ubuntu.Components 0.1
1308-import Ubuntu.Components.ListItems 0.1 as ListItem
1309-import Ubuntu.Components.Popups 0.1
1310+import Ubuntu.Components 1.3
1311+import Ubuntu.Components.ListItems 1.3 as ListItem
1312+import Ubuntu.Components.Popups 1.3
1313 import Ubuntu.SystemSettings.Reset 1.0
1314
1315 ItemPage {
1316
1317=== modified file 'plugins/reset/ResetAllSettings.qml'
1318--- plugins/reset/ResetAllSettings.qml 2014-02-27 12:55:28 +0000
1319+++ plugins/reset/ResetAllSettings.qml 2015-08-14 14:39:53 +0000
1320@@ -18,9 +18,9 @@
1321 * with this program. If not, see <http://www.gnu.org/licenses/>.
1322 */
1323
1324-import QtQuick 2.0
1325-import Ubuntu.Components 0.1
1326-import Ubuntu.Components.Popups 0.1
1327+import QtQuick 2.4
1328+import Ubuntu.Components 1.3
1329+import Ubuntu.Components.Popups 1.3
1330
1331 Component {
1332 id: resetAllSettings
1333
1334=== modified file 'plugins/reset/ResetLauncherHome.qml'
1335--- plugins/reset/ResetLauncherHome.qml 2014-10-02 13:03:10 +0000
1336+++ plugins/reset/ResetLauncherHome.qml 2015-08-14 14:39:53 +0000
1337@@ -18,9 +18,9 @@
1338 * with this program. If not, see <http://www.gnu.org/licenses/>.
1339 */
1340
1341-import QtQuick 2.0
1342-import Ubuntu.Components 0.1
1343-import Ubuntu.Components.Popups 0.1
1344+import QtQuick 2.4
1345+import Ubuntu.Components 1.3
1346+import Ubuntu.Components.Popups 1.3
1347
1348 Component {
1349 id: resetLauncherHome
1350
1351=== modified file 'plugins/security-privacy/AppAccess.qml'
1352--- plugins/security-privacy/AppAccess.qml 2015-07-13 12:09:52 +0000
1353+++ plugins/security-privacy/AppAccess.qml 2015-08-14 14:39:53 +0000
1354@@ -17,9 +17,9 @@
1355 * Alberto Mardegan <alberto.mardegan@canonical.com>
1356 */
1357
1358-import QtQuick 2.0
1359-import Ubuntu.Components 0.1
1360-import Ubuntu.Components.ListItems 0.1 as ListItem
1361+import QtQuick 2.4
1362+import Ubuntu.Components 1.3
1363+import Ubuntu.Components.ListItems 1.3 as ListItem
1364 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1365 import SystemSettings 1.0
1366
1367
1368=== modified file 'plugins/security-privacy/AppAccessControl.qml'
1369--- plugins/security-privacy/AppAccessControl.qml 2015-07-13 12:09:52 +0000
1370+++ plugins/security-privacy/AppAccessControl.qml 2015-08-14 14:39:53 +0000
1371@@ -17,9 +17,9 @@
1372 * Alberto Mardegan <alberto.mardegan@canonical.com>
1373 */
1374
1375-import QtQuick 2.0
1376-import Ubuntu.Components 0.1
1377-import Ubuntu.Components.ListItems 0.1 as ListItem
1378+import QtQuick 2.4
1379+import Ubuntu.Components 1.3
1380+import Ubuntu.Components.ListItems 1.3 as ListItem
1381 import SystemSettings 1.0
1382
1383 ItemPage {
1384
1385=== modified file 'plugins/security-privacy/Location.qml'
1386--- plugins/security-privacy/Location.qml 2014-10-31 08:45:10 +0000
1387+++ plugins/security-privacy/Location.qml 2015-08-14 14:39:53 +0000
1388@@ -21,9 +21,9 @@
1389 import GSettings 1.0
1390 import QMenuModel 0.1
1391 import Qt.labs.folderlistmodel 2.1
1392-import QtQuick 2.3
1393-import Ubuntu.Components 1.1
1394-import Ubuntu.Components.ListItems 0.1 as ListItem
1395+import QtQuick 2.4
1396+import Ubuntu.Components 1.3
1397+import Ubuntu.Components.ListItems 1.3 as ListItem
1398 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1399 import SystemSettings 1.0
1400
1401
1402=== modified file 'plugins/security-privacy/LockSecurity.qml'
1403--- plugins/security-privacy/LockSecurity.qml 2015-07-13 12:04:01 +0000
1404+++ plugins/security-privacy/LockSecurity.qml 2015-08-14 14:39:53 +0000
1405@@ -19,11 +19,11 @@
1406 */
1407
1408 import GSettings 1.0
1409-import QtQuick 2.0
1410+import QtQuick 2.4
1411 import QtQuick.Layouts 1.1
1412-import Ubuntu.Components 1.1
1413-import Ubuntu.Components.ListItems 0.1 as ListItem
1414-import Ubuntu.Components.Popups 0.1
1415+import Ubuntu.Components 1.3
1416+import Ubuntu.Components.ListItems 1.3 as ListItem
1417+import Ubuntu.Components.Popups 1.3
1418 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1419 import SystemSettings 1.0
1420
1421
1422=== modified file 'plugins/security-privacy/Ofono.qml'
1423--- plugins/security-privacy/Ofono.qml 2014-08-27 05:19:24 +0000
1424+++ plugins/security-privacy/Ofono.qml 2015-08-14 14:39:53 +0000
1425@@ -17,7 +17,7 @@
1426 * Jonas G. Drange <jonas.drange@canonical.com>
1427 *
1428 */
1429-import QtQuick 2.0
1430+import QtQuick 2.4
1431 import MeeGo.QOfono 0.2
1432
1433 Item {
1434
1435=== modified file 'plugins/security-privacy/PageComponent.qml'
1436--- plugins/security-privacy/PageComponent.qml 2015-05-21 13:32:41 +0000
1437+++ plugins/security-privacy/PageComponent.qml 2015-08-14 14:39:53 +0000
1438@@ -20,9 +20,9 @@
1439
1440 import GSettings 1.0
1441 import QMenuModel 0.1
1442-import QtQuick 2.0
1443-import Ubuntu.Components 0.1
1444-import Ubuntu.Components.ListItems 0.1 as ListItem
1445+import QtQuick 2.4
1446+import Ubuntu.Components 1.3
1447+import Ubuntu.Components.ListItems 1.3 as ListItem
1448 import SystemSettings 1.0
1449 import Ubuntu.SystemSettings.Battery 1.0
1450 import Ubuntu.SystemSettings.Diagnostics 1.0
1451
1452=== modified file 'plugins/security-privacy/PhoneLocking.qml'
1453--- plugins/security-privacy/PhoneLocking.qml 2015-07-13 12:02:13 +0000
1454+++ plugins/security-privacy/PhoneLocking.qml 2015-08-14 14:39:53 +0000
1455@@ -19,10 +19,10 @@
1456 */
1457
1458 import GSettings 1.0
1459-import QtQuick 2.0
1460+import QtQuick 2.4
1461 import SystemSettings 1.0
1462-import Ubuntu.Components 0.1
1463-import Ubuntu.Components.ListItems 0.1 as ListItem
1464+import Ubuntu.Components 1.3
1465+import Ubuntu.Components.ListItems 1.3 as ListItem
1466 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1467
1468 ItemPage {
1469
1470=== modified file 'plugins/security-privacy/SimPin.qml'
1471--- plugins/security-privacy/SimPin.qml 2015-07-13 12:00:27 +0000
1472+++ plugins/security-privacy/SimPin.qml 2015-08-14 14:39:53 +0000
1473@@ -19,11 +19,11 @@
1474 */
1475
1476 import GSettings 1.0
1477-import QtQuick 2.0
1478+import QtQuick 2.4
1479 import QtQuick.Layouts 1.1
1480-import Ubuntu.Components 1.1
1481-import Ubuntu.Components.ListItems 0.1 as ListItem
1482-import Ubuntu.Components.Popups 0.1
1483+import Ubuntu.Components 1.3
1484+import Ubuntu.Components.ListItems 1.3 as ListItem
1485+import Ubuntu.Components.Popups 1.3
1486 import SystemSettings 1.0
1487 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1488 import MeeGo.QOfono 0.2
1489
1490=== modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml'
1491--- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2013-07-26 11:12:18 +0000
1492+++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2015-08-14 14:39:53 +0000
1493@@ -18,9 +18,9 @@
1494 * with this program. If not, see <http://www.gnu.org/licenses/>.
1495 */
1496
1497-import QtQuick 2.0
1498-import Ubuntu.Components 0.1
1499-import Ubuntu.Components.ListItems 0.1 as ListItem
1500+import QtQuick 2.4
1501+import Ubuntu.Components 1.3
1502+import Ubuntu.Components.ListItems 1.3 as ListItem
1503
1504 ListItem.Base {
1505 property string textEntry: "";
1506
1507=== modified file 'plugins/security-privacy/diagnostics/PageComponent.qml'
1508--- plugins/security-privacy/diagnostics/PageComponent.qml 2015-07-13 13:13:50 +0000
1509+++ plugins/security-privacy/diagnostics/PageComponent.qml 2015-08-14 14:39:53 +0000
1510@@ -18,10 +18,10 @@
1511 * with this program. If not, see <http://www.gnu.org/licenses/>.
1512 */
1513
1514-import QtQuick 2.0
1515+import QtQuick 2.4
1516 import SystemSettings 1.0
1517-import Ubuntu.Components 0.1
1518-import Ubuntu.Components.ListItems 0.1 as ListItem
1519+import Ubuntu.Components 1.3
1520+import Ubuntu.Components.ListItems 1.3 as ListItem
1521 import Ubuntu.SystemSettings.Diagnostics 1.0
1522
1523 ItemPage {
1524
1525=== modified file 'plugins/security-privacy/here-terms.qml'
1526--- plugins/security-privacy/here-terms.qml 2014-10-16 14:28:16 +0000
1527+++ plugins/security-privacy/here-terms.qml 2015-08-14 14:39:53 +0000
1528@@ -14,10 +14,10 @@
1529 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1530 */
1531
1532-import QtQuick 2.3
1533+import QtQuick 2.4
1534 import Qt.labs.folderlistmodel 2.1
1535 import SystemSettings 1.0
1536-import Ubuntu.Components 1.1
1537+import Ubuntu.Components 1.3
1538 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1539
1540 ItemPage {
1541
1542=== modified file 'plugins/sound/PageComponent.qml'
1543--- plugins/sound/PageComponent.qml 2015-04-07 10:46:52 +0000
1544+++ plugins/sound/PageComponent.qml 2015-08-14 14:39:53 +0000
1545@@ -19,9 +19,9 @@
1546 */
1547
1548 import GSettings 1.0
1549-import QtQuick 2.0
1550-import Ubuntu.Components 0.1
1551-import Ubuntu.Components.ListItems 0.1 as ListItem
1552+import QtQuick 2.4
1553+import Ubuntu.Components 1.3
1554+import Ubuntu.Components.ListItems 1.3 as ListItem
1555 import SystemSettings 1.0
1556 import Ubuntu.SystemSettings.Sound 1.0
1557 import Ubuntu.Settings.Menus 0.1 as Menus
1558
1559=== modified file 'plugins/sound/SilentModeWarning.qml'
1560--- plugins/sound/SilentModeWarning.qml 2014-07-28 15:14:46 +0000
1561+++ plugins/sound/SilentModeWarning.qml 2015-08-14 14:39:53 +0000
1562@@ -1,7 +1,7 @@
1563-import QtQuick 2.0
1564+import QtQuick 2.4
1565 import SystemSettings 1.0
1566-import Ubuntu.Components 0.1
1567-import Ubuntu.Components.ListItems 0.1 as ListItem
1568+import Ubuntu.Components 1.3
1569+import Ubuntu.Components.ListItems 1.3 as ListItem
1570
1571 ListItem.Base {
1572 objectName: "silentModeWarning"
1573
1574=== modified file 'plugins/sound/SoundsList.qml'
1575--- plugins/sound/SoundsList.qml 2014-11-13 17:02:24 +0000
1576+++ plugins/sound/SoundsList.qml 2015-08-14 14:39:53 +0000
1577@@ -1,9 +1,9 @@
1578 import GSettings 1.0
1579-import QtQuick 2.0
1580+import QtQuick 2.4
1581 import QtMultimedia 5.0
1582 import SystemSettings 1.0
1583-import Ubuntu.Components 0.1
1584-import Ubuntu.Components.ListItems 0.1 as ListItem
1585+import Ubuntu.Components 1.3
1586+import Ubuntu.Components.ListItems 1.3 as ListItem
1587 import Ubuntu.SystemSettings.Sound 1.0
1588 import QMenuModel 0.1
1589
1590
1591=== modified file 'plugins/system-update/Configuration.qml'
1592--- plugins/system-update/Configuration.qml 2014-09-05 18:23:22 +0000
1593+++ plugins/system-update/Configuration.qml 2015-08-14 14:39:53 +0000
1594@@ -16,10 +16,10 @@
1595 * with this program. If not, see <http://www.gnu.org/licenses/>.
1596 */
1597
1598-import QtQuick 2.0
1599+import QtQuick 2.4
1600 import SystemSettings 1.0
1601-import Ubuntu.Components 0.1
1602-import Ubuntu.Components.ListItems 0.1 as ListItem
1603+import Ubuntu.Components 1.3
1604+import Ubuntu.Components.ListItems 1.3 as ListItem
1605 import Ubuntu.SystemSettings.Update 1.0
1606
1607
1608
1609=== modified file 'plugins/system-update/EntryComponent.qml'
1610--- plugins/system-update/EntryComponent.qml 2014-10-27 13:29:30 +0000
1611+++ plugins/system-update/EntryComponent.qml 2015-08-14 14:39:53 +0000
1612@@ -18,9 +18,9 @@
1613 * with this program. If not, see <http://www.gnu.org/licenses/>.
1614 */
1615
1616-import QtQuick 2.0
1617-import Ubuntu.Components 0.1
1618-import Ubuntu.Components.ListItems 0.1 as ListItem
1619+import QtQuick 2.4
1620+import Ubuntu.Components 1.3
1621+import Ubuntu.Components.ListItems 1.3 as ListItem
1622 import Ubuntu.SystemSettings.Update 1.0
1623
1624 ListItem.SingleValue {
1625
1626=== modified file 'plugins/system-update/PageComponent.qml'
1627--- plugins/system-update/PageComponent.qml 2015-06-29 13:06:41 +0000
1628+++ plugins/system-update/PageComponent.qml 2015-08-14 14:39:53 +0000
1629@@ -20,11 +20,11 @@
1630 */
1631
1632 import QMenuModel 0.1
1633-import QtQuick 2.0
1634+import QtQuick 2.4
1635 import SystemSettings 1.0
1636-import Ubuntu.Components 0.1
1637-import Ubuntu.Components.ListItems 0.1 as ListItem
1638-import Ubuntu.Components.Popups 0.1
1639+import Ubuntu.Components 1.3
1640+import Ubuntu.Components.ListItems 1.3 as ListItem
1641+import Ubuntu.Components.Popups 1.3
1642 import Ubuntu.OnlineAccounts.Client 0.1
1643 import Ubuntu.SystemSettings.Update 1.0
1644 import Ubuntu.Connectivity 1.0
1645
1646=== modified file 'plugins/time-date/ChooseTimeZone.qml'
1647--- plugins/time-date/ChooseTimeZone.qml 2014-06-11 13:05:23 +0000
1648+++ plugins/time-date/ChooseTimeZone.qml 2015-08-14 14:39:53 +0000
1649@@ -18,10 +18,10 @@
1650 * with this program. If not, see <http://www.gnu.org/licenses/>.
1651 */
1652
1653-import QtQuick 2.0
1654+import QtQuick 2.4
1655 import SystemSettings 1.0
1656-import Ubuntu.Components 0.1
1657-import Ubuntu.Components.ListItems 0.1 as ListItem
1658+import Ubuntu.Components 1.3
1659+import Ubuntu.Components.ListItems 1.3 as ListItem
1660 import Ubuntu.SystemSettings.TimeDate 1.0
1661
1662 ItemPage {
1663
1664=== modified file 'plugins/time-date/PageComponent.qml'
1665--- plugins/time-date/PageComponent.qml 2015-08-04 18:14:04 +0000
1666+++ plugins/time-date/PageComponent.qml 2015-08-14 14:39:53 +0000
1667@@ -18,11 +18,11 @@
1668 * with this program. If not, see <http://www.gnu.org/licenses/>.
1669 */
1670
1671-import QtQuick 2.0
1672+import QtQuick 2.4
1673 import SystemSettings 1.0
1674-import Ubuntu.Components 0.1
1675-import Ubuntu.Components.ListItems 0.1 as ListItem
1676-import Ubuntu.Components.Popups 0.1
1677+import Ubuntu.Components 1.3
1678+import Ubuntu.Components.ListItems 1.3 as ListItem
1679+import Ubuntu.Components.Popups 1.3
1680 import Ubuntu.SystemSettings.TimeDate 1.0
1681
1682 ItemPage {
1683
1684=== modified file 'plugins/time-date/Scroller.qml'
1685--- plugins/time-date/Scroller.qml 2013-10-09 15:42:36 +0000
1686+++ plugins/time-date/Scroller.qml 2015-08-14 14:39:53 +0000
1687@@ -16,9 +16,9 @@
1688 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1689 */
1690
1691-import QtQuick 2.0
1692-import Ubuntu.Components 0.1
1693-import Ubuntu.Components.ListItems 0.1 as ListItems
1694+import QtQuick 2.4
1695+import Ubuntu.Components 1.3
1696+import Ubuntu.Components.ListItems 1.3 as ListItems
1697
1698 Item {
1699 id: root
1700
1701=== modified file 'plugins/time-date/TimePicker.qml'
1702--- plugins/time-date/TimePicker.qml 2013-10-07 11:02:12 +0000
1703+++ plugins/time-date/TimePicker.qml 2015-08-14 14:39:53 +0000
1704@@ -16,10 +16,10 @@
1705 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1706 */
1707
1708-import QtQuick 2.0
1709-import Ubuntu.Components 0.1
1710-import Ubuntu.Components.ListItems 0.1 as ListItem
1711-import Ubuntu.Components.Popups 0.1
1712+import QtQuick 2.4
1713+import Ubuntu.Components 1.3
1714+import Ubuntu.Components.ListItems 1.3 as ListItem
1715+import Ubuntu.Components.Popups 1.3
1716
1717 Dialog {
1718 id: root
1719
1720=== modified file 'plugins/wifi/AccessPoint.qml'
1721--- plugins/wifi/AccessPoint.qml 2015-06-08 15:43:08 +0000
1722+++ plugins/wifi/AccessPoint.qml 2015-08-14 14:39:53 +0000
1723@@ -17,9 +17,9 @@
1724 * Renato Araujo Oliveira Filho <renato@canonical.com>
1725 */
1726
1727-import QtQuick 2.0
1728-import Ubuntu.Components 0.1
1729-import Ubuntu.Components.ListItems 0.1 as ListItem
1730+import QtQuick 2.4
1731+import Ubuntu.Components 1.3
1732+import Ubuntu.Components.ListItems 1.3 as ListItem
1733
1734 FramedMenuItem {
1735 id: accessPoint
1736
1737=== modified file 'plugins/wifi/BaseMenuItem.qml'
1738--- plugins/wifi/BaseMenuItem.qml 2013-09-18 19:41:37 +0000
1739+++ plugins/wifi/BaseMenuItem.qml 2015-08-14 14:39:53 +0000
1740@@ -18,8 +18,8 @@
1741 * Nick Dedekind <nick.dedekind@canonical.com>
1742 */
1743
1744-import QtQuick 2.0
1745-import Ubuntu.Components.ListItems 0.1 as ListItem
1746+import QtQuick 2.4
1747+import Ubuntu.Components.ListItems 1.3 as ListItem
1748
1749 ListItem.Standard {
1750 id: baseMenu
1751
1752=== modified file 'plugins/wifi/CertDialog.qml'
1753--- plugins/wifi/CertDialog.qml 2015-06-24 11:05:11 +0000
1754+++ plugins/wifi/CertDialog.qml 2015-08-14 14:39:53 +0000
1755@@ -1,8 +1,8 @@
1756-import QtQuick 2.0
1757+import QtQuick 2.4
1758 import QtQuick.Layouts 1.1
1759-import Ubuntu.Components.Popups 0.1
1760-import Ubuntu.Components 0.1
1761-import Ubuntu.Components.ListItems 0.1 as ListItem
1762+import Ubuntu.Components.Popups 1.3
1763+import Ubuntu.Components 1.3
1764+import Ubuntu.Components.ListItems 1.3 as ListItem
1765 import Ubuntu.SystemSettings.Wifi 1.0
1766
1767 Component {
1768
1769=== modified file 'plugins/wifi/CertPicker.qml'
1770--- plugins/wifi/CertPicker.qml 2015-06-24 11:05:11 +0000
1771+++ plugins/wifi/CertPicker.qml 2015-08-14 14:39:53 +0000
1772@@ -1,7 +1,7 @@
1773-import QtQuick 2.0
1774+import QtQuick 2.4
1775 import QtQuick.Layouts 1.1
1776-import Ubuntu.Components 0.1
1777-import Ubuntu.Components.Popups 0.1
1778+import Ubuntu.Components 1.3
1779+import Ubuntu.Components.Popups 1.3
1780 import Ubuntu.Content 0.1
1781
1782 PopupBase {
1783
1784=== modified file 'plugins/wifi/Common.qml'
1785--- plugins/wifi/Common.qml 2014-09-22 15:29:16 +0000
1786+++ plugins/wifi/Common.qml 2015-08-14 14:39:53 +0000
1787@@ -17,7 +17,7 @@
1788 * Jonas G. Drange <jonas.drange@canonical.com>
1789 *
1790 */
1791-import QtQuick 2.0
1792+import QtQuick 2.4
1793
1794 Item {
1795
1796
1797=== modified file 'plugins/wifi/DivMenuItem.qml'
1798--- plugins/wifi/DivMenuItem.qml 2013-10-18 10:30:18 +0000
1799+++ plugins/wifi/DivMenuItem.qml 2015-08-14 14:39:53 +0000
1800@@ -17,8 +17,8 @@
1801 * Olivier Tilloy <olivier.tilloy@canonical.com>
1802 */
1803
1804-import QtQuick 2.0
1805-import Ubuntu.Components.ListItems 0.1 as ListItem
1806+import QtQuick 2.4
1807+import Ubuntu.Components.ListItems 1.3 as ListItem
1808
1809 ListItem.Empty {
1810 height: units.gu(3)
1811
1812=== modified file 'plugins/wifi/FramedMenuItem.qml'
1813--- plugins/wifi/FramedMenuItem.qml 2013-10-09 16:32:18 +0000
1814+++ plugins/wifi/FramedMenuItem.qml 2015-08-14 14:39:53 +0000
1815@@ -18,8 +18,8 @@
1816 * Nick Dedekind <nick.dedekind@canonical.com>
1817 */
1818
1819-import QtQuick 2.0
1820-import Ubuntu.Components 0.1
1821-import Ubuntu.Components.ListItems 0.1 as ListItem
1822+import QtQuick 2.4
1823+import Ubuntu.Components 1.3
1824+import Ubuntu.Components.ListItems 1.3 as ListItem
1825
1826 ListItem.Standard {}
1827
1828=== modified file 'plugins/wifi/HLine.qml'
1829--- plugins/wifi/HLine.qml 2013-09-18 19:41:37 +0000
1830+++ plugins/wifi/HLine.qml 2015-08-14 14:39:53 +0000
1831@@ -17,8 +17,8 @@
1832 * Renato Araujo Oliveira Filho <renato@canonical.com>
1833 */
1834
1835-import QtQuick 2.0
1836-import Ubuntu.Components 0.1
1837+import QtQuick 2.4
1838+import Ubuntu.Components 1.3
1839
1840 Rectangle {
1841 height: units.dp(1)
1842
1843=== modified file 'plugins/wifi/IndicatorBase.qml'
1844--- plugins/wifi/IndicatorBase.qml 2013-09-18 19:41:37 +0000
1845+++ plugins/wifi/IndicatorBase.qml 2015-08-14 14:39:53 +0000
1846@@ -17,10 +17,10 @@
1847 * Nick Dedekind <nick.dedekind@canonical.com>
1848 */
1849
1850-import QtQuick 2.0
1851+import QtQuick 2.4
1852 import QMenuModel 0.1 as QMenuModel
1853 import SystemSettings 1.0
1854-import Ubuntu.Components 0.1
1855+import Ubuntu.Components 1.3
1856
1857 ItemPage {
1858 id: indicatorItem
1859
1860=== modified file 'plugins/wifi/MenuItemFactory.qml'
1861--- plugins/wifi/MenuItemFactory.qml 2015-07-09 15:12:11 +0000
1862+++ plugins/wifi/MenuItemFactory.qml 2015-08-14 14:39:53 +0000
1863@@ -17,7 +17,7 @@
1864 * Nick Dedekind <nick.dedekind@canonical.com>
1865 */
1866
1867-import QtQuick 2.0
1868+import QtQuick 2.4
1869 import QMenuModel 0.1 as QMenuModel
1870 import Ubuntu.Settings.Menus 0.1 as Menus
1871 import Ubuntu.Settings.Components 0.1 as USC
1872
1873=== modified file 'plugins/wifi/NetworkDetails.qml'
1874--- plugins/wifi/NetworkDetails.qml 2015-07-13 12:23:27 +0000
1875+++ plugins/wifi/NetworkDetails.qml 2015-08-14 14:39:53 +0000
1876@@ -18,11 +18,11 @@
1877 * with this program. If not, see <http://www.gnu.org/licenses/>.
1878 */
1879
1880-import QtQuick 2.0
1881+import QtQuick 2.4
1882 import QtQuick.Layouts 1.1
1883 import SystemSettings 1.0
1884-import Ubuntu.Components 0.1
1885-import Ubuntu.Components.ListItems 0.1 as ListItem
1886+import Ubuntu.Components 1.3
1887+import Ubuntu.Components.ListItems 1.3 as ListItem
1888 import Ubuntu.SystemSettings.Wifi 1.0
1889
1890 ItemPage {
1891
1892=== modified file 'plugins/wifi/NetworkDetailsBrief.qml'
1893--- plugins/wifi/NetworkDetailsBrief.qml 2015-07-13 13:13:50 +0000
1894+++ plugins/wifi/NetworkDetailsBrief.qml 2015-08-14 14:39:53 +0000
1895@@ -18,11 +18,11 @@
1896 * with this program. If not, see <http://www.gnu.org/licenses/>.
1897 */
1898
1899-import QtQuick 2.0
1900+import QtQuick 2.4
1901 import QtQuick.Layouts 1.1
1902 import SystemSettings 1.0
1903-import Ubuntu.Components 0.1
1904-import Ubuntu.Components.ListItems 0.1 as ListItem
1905+import Ubuntu.Components 1.3
1906+import Ubuntu.Components.ListItems 1.3 as ListItem
1907 import Ubuntu.SystemSettings.Wifi 1.0
1908
1909 ItemPage {
1910
1911=== modified file 'plugins/wifi/OtherNetwork.qml'
1912--- plugins/wifi/OtherNetwork.qml 2015-07-06 12:59:26 +0000
1913+++ plugins/wifi/OtherNetwork.qml 2015-08-14 14:39:53 +0000
1914@@ -14,12 +14,12 @@
1915 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1916 */
1917
1918-import QtQuick 2.0
1919+import QtQuick 2.4
1920 import QtQuick.Layouts 1.1
1921 import SystemSettings 1.0
1922-import Ubuntu.Components 0.1
1923-import Ubuntu.Components.ListItems 0.1 as ListItem
1924-import Ubuntu.Components.Popups 0.1
1925+import Ubuntu.Components 1.3
1926+import Ubuntu.Components.ListItems 1.3 as ListItem
1927+import Ubuntu.Components.Popups 1.3
1928 import Ubuntu.SystemSettings.Wifi 1.0
1929 import QMenuModel 0.1
1930
1931
1932=== modified file 'plugins/wifi/PageComponent.qml'
1933--- plugins/wifi/PageComponent.qml 2015-07-07 14:41:51 +0000
1934+++ plugins/wifi/PageComponent.qml 2015-08-14 14:39:53 +0000
1935@@ -14,11 +14,11 @@
1936 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1937 */
1938
1939-import QtQuick 2.0
1940+import QtQuick 2.4
1941 import SystemSettings 1.0
1942-import Ubuntu.Components 0.1
1943-import Ubuntu.Components.ListItems 0.1 as ListItem
1944-import Ubuntu.Components.Popups 0.1
1945+import Ubuntu.Components 1.3
1946+import Ubuntu.Components.ListItems 1.3 as ListItem
1947+import Ubuntu.Components.Popups 1.3
1948 import Ubuntu.SystemSettings.Wifi 1.0
1949 import QMenuModel 0.1
1950
1951
1952=== modified file 'plugins/wifi/PreviousNetworks.qml'
1953--- plugins/wifi/PreviousNetworks.qml 2014-09-26 12:52:31 +0000
1954+++ plugins/wifi/PreviousNetworks.qml 2015-08-14 14:39:53 +0000
1955@@ -14,10 +14,10 @@
1956 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1957 */
1958
1959-import QtQuick 2.0
1960+import QtQuick 2.4
1961 import SystemSettings 1.0
1962-import Ubuntu.Components 0.1
1963-import Ubuntu.Components.ListItems 0.1 as ListItem
1964+import Ubuntu.Components 1.3
1965+import Ubuntu.Components.ListItems 1.3 as ListItem
1966 import Ubuntu.SystemSettings.Wifi 1.0
1967 import QMenuModel 0.1
1968
1969
1970=== modified file 'plugins/wifi/RemoveBackground.qml'
1971--- plugins/wifi/RemoveBackground.qml 2014-09-25 09:30:34 +0000
1972+++ plugins/wifi/RemoveBackground.qml 2015-08-14 14:39:53 +0000
1973@@ -14,8 +14,8 @@
1974 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1975 */
1976
1977-import QtQuick 2.0
1978-import Ubuntu.Components 0.1
1979+import QtQuick 2.4
1980+import Ubuntu.Components 1.3
1981
1982 Rectangle {
1983 anchors.fill: parent
1984
1985=== modified file 'plugins/wifi/SectionMenuItem.qml'
1986--- plugins/wifi/SectionMenuItem.qml 2013-09-18 19:41:37 +0000
1987+++ plugins/wifi/SectionMenuItem.qml 2015-08-14 14:39:53 +0000
1988@@ -17,9 +17,9 @@
1989 * Renato Araujo Oliveira Filho <renato@canonical.com>
1990 */
1991
1992-import QtQuick 2.0
1993-import Ubuntu.Components 0.1
1994-import Ubuntu.Components.ListItems 0.1 as ListItem
1995+import QtQuick 2.4
1996+import Ubuntu.Components 1.3
1997+import Ubuntu.Components.ListItems 1.3 as ListItem
1998
1999 BaseMenuItem {
2000 id: menuItem
2001
2002=== modified file 'plugins/wifi/StandardMenuItem.qml'
2003--- plugins/wifi/StandardMenuItem.qml 2013-10-18 10:34:32 +0000
2004+++ plugins/wifi/StandardMenuItem.qml 2015-08-14 14:39:53 +0000
2005@@ -17,8 +17,8 @@
2006 * Nick Dedekind <nick.dedekind@canonical.com>
2007 */
2008
2009-import QtQuick 2.0
2010-import Ubuntu.Components 0.1
2011+import QtQuick 2.4
2012+import Ubuntu.Components 1.3
2013
2014 FramedMenuItem {
2015 id: menuItem
2016
2017=== modified file 'plugins/wifi/SwitchMenuItem.qml'
2018--- plugins/wifi/SwitchMenuItem.qml 2013-10-18 10:33:28 +0000
2019+++ plugins/wifi/SwitchMenuItem.qml 2015-08-14 14:39:53 +0000
2020@@ -18,8 +18,8 @@
2021 * Nick Dedekind <nick.dedekind@canonical.com>
2022 */
2023
2024-import QtQuick 2.0
2025-import Ubuntu.Components 0.1
2026+import QtQuick 2.4
2027+import Ubuntu.Components 1.3
2028
2029 FramedMenuItem {
2030 id: menuItem
2031
2032=== modified file 'src/SystemSettings/ItemPage.qml'
2033--- src/SystemSettings/ItemPage.qml 2015-01-26 16:00:44 +0000
2034+++ src/SystemSettings/ItemPage.qml 2015-08-14 14:39:53 +0000
2035@@ -18,8 +18,8 @@
2036 * with this program. If not, see <http://www.gnu.org/licenses/>.
2037 */
2038
2039-import QtQuick 2.0
2040-import Ubuntu.Components 1.1
2041+import QtQuick 2.4
2042+import Ubuntu.Components 1.3
2043
2044 Page {
2045 id: root
2046
2047=== modified file 'src/SystemSettings/SettingsItemTitle.qml'
2048--- src/SystemSettings/SettingsItemTitle.qml 2014-10-31 08:45:10 +0000
2049+++ src/SystemSettings/SettingsItemTitle.qml 2015-08-14 14:39:53 +0000
2050@@ -16,9 +16,9 @@
2051 * with this program. If not, see <http://www.gnu.org/licenses/>.
2052 */
2053
2054-import QtQuick 2.0
2055-import Ubuntu.Components 0.1
2056-import Ubuntu.Components.ListItems 0.1 as ListItem
2057+import QtQuick 2.4
2058+import Ubuntu.Components 1.3
2059+import Ubuntu.Components.ListItems 1.3 as ListItem
2060
2061 ListItem.Standard {
2062 id: itemEmpty
2063
2064=== modified file 'src/qml/CategoryGrid.qml'
2065--- src/qml/CategoryGrid.qml 2015-02-02 15:47:02 +0000
2066+++ src/qml/CategoryGrid.qml 2015-08-14 14:39:53 +0000
2067@@ -1,6 +1,6 @@
2068-import QtQuick 2.0
2069-import Ubuntu.Components 0.1
2070-import Ubuntu.Components.ListItems 0.1 as ListItem
2071+import QtQuick 2.4
2072+import Ubuntu.Components 1.3
2073+import Ubuntu.Components.ListItems 1.3 as ListItem
2074
2075 Column {
2076 anchors {
2077
2078=== modified file 'src/qml/EntryComponent.qml'
2079--- src/qml/EntryComponent.qml 2014-09-12 16:10:50 +0000
2080+++ src/qml/EntryComponent.qml 2015-08-14 14:39:53 +0000
2081@@ -18,8 +18,8 @@
2082 * with this program. If not, see <http://www.gnu.org/licenses/>.
2083 */
2084
2085-import QtQuick 2.0
2086-import Ubuntu.Components 1.1
2087+import QtQuick 2.4
2088+import Ubuntu.Components 1.3
2089 import Ubuntu.Settings.Components 0.1
2090
2091 Item {
2092@@ -70,7 +70,7 @@
2093 fill: root
2094 margins: -units.gu(0.25)
2095 }
2096- color: UbuntuColors.darkGrey
2097+ backgroundColor: UbuntuColors.darkGrey
2098 opacity: 0.15
2099 }
2100 }
2101
2102=== modified file 'src/qml/MainWindow.qml'
2103--- src/qml/MainWindow.qml 2015-06-30 20:36:26 +0000
2104+++ src/qml/MainWindow.qml 2015-08-14 14:39:53 +0000
2105@@ -18,9 +18,9 @@
2106 * with this program. If not, see <http://www.gnu.org/licenses/>.
2107 */
2108
2109-import QtQuick 2.0
2110-import Ubuntu.Components 0.1
2111-import Ubuntu.Components.ListItems 0.1 as ListItem
2112+import QtQuick 2.4
2113+import Ubuntu.Components 1.3
2114+import Ubuntu.Components.ListItems 1.3 as ListItem
2115 import SystemSettings 1.0
2116
2117 MainView {
2118@@ -30,7 +30,6 @@
2119 applicationName: "ubuntu-system-settings"
2120 objectName: "systemSettingsMainView"
2121 automaticOrientation: true
2122- useDeprecatedToolbar: false
2123 anchorToKeyboard: true
2124
2125 function loadPluginByName(pluginName, pluginOptions) {
2126
2127=== modified file 'src/qml/UncategorizedItemsView.qml'
2128--- src/qml/UncategorizedItemsView.qml 2014-10-27 13:17:32 +0000
2129+++ src/qml/UncategorizedItemsView.qml 2015-08-14 14:39:53 +0000
2130@@ -18,9 +18,9 @@
2131 * with this program. If not, see <http://www.gnu.org/licenses/>.
2132 */
2133
2134-import QtQuick 2.0
2135-import Ubuntu.Components 0.1
2136-import Ubuntu.Components.ListItems 0.1 as ListItem
2137+import QtQuick 2.4
2138+import Ubuntu.Components 1.3
2139+import Ubuntu.Components.ListItems 1.3 as ListItem
2140 import SystemSettings 1.0
2141
2142 Column {
2143
2144=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
2145--- tests/autopilot/ubuntu_system_settings/__init__.py 2015-08-10 20:05:22 +0000
2146+++ tests/autopilot/ubuntu_system_settings/__init__.py 2015-08-14 14:39:53 +0000
2147@@ -1530,6 +1530,7 @@
2148 dialog = self._click_connect_to_hidden_network()
2149 dialog._scroll_to_and_click = self._scroll_to_and_click
2150 dialog.enter_name(name)
2151+ utils.dismiss_osk()
2152
2153 if security:
2154 dialog.set_security(security)
2155@@ -1539,8 +1540,10 @@
2156 dialog.set_protocol(protocol)
2157 if username:
2158 dialog.enter_username(username)
2159+ utils.dismiss_osk()
2160 if password:
2161 dialog.enter_password(password)
2162+ utils.dismiss_osk()
2163 if cancel:
2164 utils.dismiss_osk()
2165 dialog.cancel()
2166
2167=== modified file 'tests/test-plugin.cpp'
2168--- tests/test-plugin.cpp 2014-03-03 12:57:40 +0000
2169+++ tests/test-plugin.cpp 2015-08-14 14:39:53 +0000
2170@@ -67,7 +67,7 @@
2171 {
2172 if (m_pageComponent == NULL) {
2173 QQmlComponent *page = new QQmlComponent(engine, parent);
2174- page->setData("import QtQuick 2.0\n"
2175+ page->setData("import QtQuick 2.4\n"
2176 "Rectangle {\n"
2177 " function reset() { console.log('Hello') }\n"
2178 " width: 200; height: 200;\n"

Subscribers

People subscribed via source and target branches