Merge lp:~dandrader/ubuntu-settings-components/deprecation-warnings into lp:~registry/ubuntu-settings-components/trunk

[Daniel d'Andrada]

Avoid creating a deluge of deprecation warnings

unity8 log is getting filled with the following warning:

"""
<Unknown File>: QML UCDeprecatedTheme: Theme.palette is deprecated. Use ThemeSettings instead.
"""

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Can we move everything to 1.3 at this point and test it works fine?

review: Needs Fixing

[lp:~dandrader/ubuntu-settings-components/deprecation-warnings]

91. By Daniel d'Andrada on 2015-06-18

Moving everything to Ubuntu.Components 1.3

[Daniel d'Andrada (dandrader)]

> Can we move everything to 1.3 at this point and test it works fine?

Done. Tested on the phone and all seems fine.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

There's just a minor "Theme.name" in examples/SettingsComponents.qml but the rest is fine

review: Needs Fixing

[lp:~dandrader/ubuntu-settings-components/deprecation-warnings]

92. By Daniel d'Andrada on 2015-06-23

s/Theme.name/theme.name

[Daniel d'Andrada (dandrader)]

On 22/06/15 07:32, Andrea Cimitan wrote:
> Review: Needs Fixing
>
> There's just a minor "Theme.name" in examples/SettingsComponents.qml but the rest is fine

Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve

[Michael Zanetti (mzanetti)]

The SDK guys said that 1.3 is not stable API yet. I'm afraid we block them of changing the API when we're already using it.

review: Needs Information

[Nick Dedekind (nick-dedekind)]

perhaps we shouldn't approve the branch until this happens?

=== modified file 'examples/MessageComponents.qml'
--- examples/MessageComponents.qml	2014-09-11 13:30:09 +0000
+++ examples/MessageComponents.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 

=== modified file 'examples/OtherComponents.qml'
--- examples/OtherComponents.qml	2014-09-24 09:53:06 +0000
+++ examples/OtherComponents.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 

=== modified file 'examples/SettingsComponents.qml'
--- examples/SettingsComponents.qml	2014-08-14 11:51:14 +0000
+++ examples/SettingsComponents.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 
@@ -30,7 +30,7 @@
     height: units.gu(75)
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
     }
 
     ListModel {

=== modified file 'examples/TransferComponents.qml'
--- examples/TransferComponents.qml	2014-09-11 13:30:09 +0000
+++ examples/TransferComponents.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
 */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 

=== modified file 'plugins/Ubuntu/Settings/Components/ActionTextField.qml'
--- plugins/Ubuntu/Settings/Components/ActionTextField.qml	2014-11-12 10:49:22 +0000
+++ plugins/Ubuntu/Settings/Components/ActionTextField.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 
 Item {

=== modified file 'plugins/Ubuntu/Settings/Components/Calendar.qml'
--- plugins/Ubuntu/Settings/Components/Calendar.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Components/Calendar.qml	2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 
 ListView {
@@ -203,8 +203,8 @@
                     property var dayStart: gridStart.addDays(index)
 
                     // Styling properties
-                    property color color: Theme.palette.selected.backgroundText
-                    property color todayColor: Theme.palette.selected.foreground
+                    property color color: theme.palette.selected.backgroundText
+                    property color todayColor: theme.palette.selected.foreground
                     property string fontSize: "large"
                     property var backgroundColor: "transparent" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
                     property var sundayBackgroundColor: "#19AEA79F" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)

=== modified file 'plugins/Ubuntu/Settings/Components/MessageHeader.qml'
--- plugins/Ubuntu/Settings/Components/MessageHeader.qml	2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Components/MessageHeader.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 
 Item {
@@ -60,7 +60,7 @@
 
                 color: {
                     if (String(source).match(/^image:\/\/theme/)) {
-                        return Theme.palette.selected.backgroundText;
+                        return theme.palette.selected.backgroundText;
                     }
                     return Qt.rgba(0.0, 0.0, 0.0, 0.0);
                 }
@@ -117,7 +117,7 @@
             Layout.preferredHeight: units.gu(3)
             Layout.preferredWidth: units.gu(3)
             Layout.alignment: Qt.AlignRight
-            color: Theme.palette.selected.backgroundText
+            color: theme.palette.selected.backgroundText
 
             MouseArea {
                 anchors.fill: parent

=== modified file 'plugins/Ubuntu/Settings/Components/QuickReply.qml'
--- plugins/Ubuntu/Settings/Components/QuickReply.qml	2014-09-25 11:35:37 +0000
+++ plugins/Ubuntu/Settings/Components/QuickReply.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Item {

=== modified file 'plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml'
--- plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml	2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml	2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
  * general (Item-based) components. This ability should be incorporated into the SDK's

=== modified file 'plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml'
--- plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml	2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml	2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Empty {
@@ -35,7 +35,7 @@
         id: iconSignal
         objectName: "iconSignal"
 
-        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
+        color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
 
         width: height
         height: Math.min(units.gu(3), parent.height - units.gu(1))
@@ -73,7 +73,7 @@
             rightMargin: menu.__contentsMargins
         }
         elide: Text.ElideRight
-        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
+        color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
     }
 
     Icon {
@@ -82,7 +82,7 @@
         visible: secure
         name: "network-secure"
 
-        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
+        color: active ? UbuntuColors.green : theme.palette.selected.backgroundText
 
         width: height
         height: Math.min(units.gu(3), parent.height - units.gu(1))

=== modified file 'plugins/Ubuntu/Settings/Menus/ButtonMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ButtonMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ButtonMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 StandardMenu {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/CalendarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Settings.Components 0.1
 

=== modified file 'plugins/Ubuntu/Settings/Menus/CheckableMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CheckableMenu.qml	2014-09-16 14:05:54 +0000
+++ plugins/Ubuntu/Settings/Menus/CheckableMenu.qml	2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1 as Components
+import Ubuntu.Components 1.3 as Components
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/EventMenu.qml'
--- plugins/Ubuntu/Settings/Menus/EventMenu.qml	2014-09-11 14:46:02 +0000
+++ plugins/Ubuntu/Settings/Menus/EventMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 
 ListItems.Empty {
@@ -32,7 +32,7 @@
         id: iconVisual
         source: "image://theme/calendar"
         visible: source != ""
-        color: Theme.palette.selected.backgroundText
+        color: theme.palette.selected.backgroundText
 
         height: Math.min(units.gu(3), parent.height - units.gu(1))
         width: height

=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 StandardMenu {
@@ -36,7 +36,7 @@
             height: label.implicitHeight + units.gu(2)
             width: label.implicitWidth + units.gu(2)
 
-            color: Theme.palette.normal.backgroundText
+            color: theme.palette.normal.backgroundText
             radius: "medium"
 
             Label {
@@ -52,7 +52,7 @@
                 fontSize: "medium"
                 text: menu.count
 
-                color: Theme.palette.normal.foregroundText
+                color: theme.palette.normal.foregroundText
             }
         }
     }

=== modified file 'plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
--- plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2014-09-24 09:53:06 +0000
+++ plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtQuick.Layouts 1.1
 

=== modified file 'plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml'
--- plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2014-09-23 15:50:37 +0000
+++ plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtQuick.Layouts 1.1
 
@@ -51,8 +51,8 @@
             source: "image://theme/media-skip-backward"
             color: {
                 if (!enabled)
-                    return Theme.palette.normal.backgroundText;
-                return prevMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+                    return theme.palette.normal.backgroundText;
+                return prevMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
             }
             enabled: canGoPrevious
 
@@ -72,8 +72,8 @@
             source: playing ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
             color: {
                 if (!enabled)
-                    return Theme.palette.normal.backgroundText;
-                return playMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+                    return theme.palette.normal.backgroundText;
+                return playMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
             }
             enabled: canPlay
 
@@ -93,8 +93,8 @@
             source: "image://theme/media-skip-forward"
             color: {
                 if (!enabled)
-                    return Theme.palette.normal.backgroundText;
-                return nextMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+                    return theme.palette.normal.backgroundText;
+                return nextMA.pressed ? theme.palette.selected.foreground : theme.palette.normal.foregroundText;
             }
             enabled: canGoNext
 

=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 StandardMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml	2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 StandardMenu {
     id: menuItem

=== modified file 'plugins/Ubuntu/Settings/Menus/SectionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SectionMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/SectionMenu.qml	2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Header {

=== modified file 'plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml	2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Settings.Components 0.1 as USC
 import QtQuick.Layouts 1.1

=== modified file 'plugins/Ubuntu/Settings/Menus/SliderMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SliderMenu.qml	2014-09-11 14:46:02 +0000
+++ plugins/Ubuntu/Settings/Menus/SliderMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Empty {
@@ -133,7 +133,7 @@
                 anchors.verticalCenter: row.verticalCenter
                 height: slider.height - units.gu(2)
                 width: height
-                color: Theme.palette.selected.backgroundText
+                color: theme.palette.selected.backgroundText
 
                 MouseArea {
                     anchors.fill: parent
@@ -189,7 +189,7 @@
                 anchors.verticalCenter: row.verticalCenter
                 height: slider.height - units.gu(2)
                 width: height
-                color: Theme.palette.selected.backgroundText
+                color: theme.palette.selected.backgroundText
 
                 MouseArea {
                     anchors.fill: parent

=== modified file 'plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2014-08-14 11:19:43 +0000
+++ plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1 as USC
 import QtQuick.Layouts 1.1
 

=== modified file 'plugins/Ubuntu/Settings/Menus/StandardMenu.qml'
--- plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2014-09-22 16:37:31 +0000
+++ plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2015-06-23 12:15:30 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import QtQuick.Layouts 1.1
 
@@ -52,7 +52,7 @@
         Icon {
             id: iconVisual
             visible: source != ""
-            color: Theme.palette.selected.backgroundText
+            color: theme.palette.selected.backgroundText
 
             readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)
 

=== modified file 'plugins/Ubuntu/Settings/Menus/SwitchMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SwitchMenu.qml	2014-09-16 12:49:38 +0000
+++ plugins/Ubuntu/Settings/Menus/SwitchMenu.qml	2015-06-23 12:15:30 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 StandardMenu {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2014-11-12 10:49:22 +0000
+++ plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1 as USC
 
 SimpleMessageMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 StandardMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/TransferMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TransferMenu.qml	2014-09-15 17:18:27 +0000
+++ plugins/Ubuntu/Settings/Menus/TransferMenu.qml	2015-06-23 12:15:30 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Settings.Components 0.1
 
@@ -56,7 +56,7 @@
 
                 color: {
                     if (String(source).match(/^image:\/\/theme/)) {
-                        return Theme.palette.selected.backgroundText;
+                        return theme.palette.selected.backgroundText;
                     }
                     return Qt.rgba(0.0, 0.0, 0.0, 0.0);
                 }

=== modified file 'plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2015-06-23 12:15:30 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 StandardMenu {
@@ -34,7 +34,7 @@
             height: checkMark.height + units.gu(1.5)
             radius: width / 2
             antialiasing: true
-            color: Theme.palette.normal.backgroundText
+            color: theme.palette.normal.backgroundText
             visible: userSessionMenu.active
 
             Image {

=== modified file 'tests/qmltests/Components/tst_ServerPropertySynchroniser.qml'
--- tests/qmltests/Components/tst_ServerPropertySynchroniser.qml	2015-04-24 13:15:20 +0000
+++ tests/qmltests/Components/tst_ServerPropertySynchroniser.qml	2015-06-23 12:15:30 +0000
@@ -19,7 +19,7 @@
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Components 0.1 as USC
 import Ubuntu.Settings.Menus 0.1 as USM
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml'
--- tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml	2015-03-20 14:04:36 +0000
+++ tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml	2015-06-23 12:15:30 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Test 0.1 as UT
 
 TestCase {