Merge lp:~dandrader/unity8/deprecatedTheme into lp:unity8

[Daniel d'Andrada]

s/Theme.palette/theme.palette

Stop using the deprecated Theme.palette API and start using "theme" context property from Ubuntu.Components 1.3

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, although along with https://code.launchpad.net/~dandrader/ubuntu-settings-components/deprecation-warnings/+merge/262267 we should no longer get any of those "<Unknown File>: QML UCDeprecatedTheme: Theme.palette is deprecated. Use ThemeSettings instead." warnings.

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* Did you make sure that your branch does not contain spurious tags?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

* Did you have a look at the warnings when running tests? Can they be reduced?
That's what this branch is trying to do.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1751
http://jenkins.qa.ubuntu.com/job/unity8-ci/5817/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/109/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5817/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1751
http://jenkins.qa.ubuntu.com/job/unity8-ci/5822/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/114/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5822/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1808
http://jenkins.qa.ubuntu.com/job/unity8-ci/5823/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/115/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5823/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/deprecatedTheme]

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

s/Theme.palette/theme.palette

Stop using the deprecated Theme.palette API and start using "theme" context
property from Ubuntu.Components 1.3

[Andrea Cimitan (cimi)]

We need to update all files to 1.3 and test for regressions

cimi@libra:~/Development/unity8/deprecatedTheme$ grep -rn "Components 1\.1" .
./plugins/Dash/ScopeStyle.qml:19:import Ubuntu.Components 1.1
./qml/Greeter/Greeter.qml:20:import Ubuntu.Components 1.1
./qml/Greeter/CoverPage.qml:18:import Ubuntu.Components 1.1
./qml/Greeter/WideView.qml:18:import Ubuntu.Components 1.1
./qml/Greeter/NarrowView.qml:18:import Ubuntu.Components 1.1
./qml/Greeter/LoginList.qml:18:import Ubuntu.Components 1.1
./qml/Launcher/LauncherPanel.qml:18:import Ubuntu.Components 1.1
./qml/Rotation/RotationStates.qml:18:import Ubuntu.Components 1.1
./qml/Panel/IndicatorsBar.qml:18:import Ubuntu.Components 1.1
./qml/Panel/IndicatorItemRow.qml:18:import Ubuntu.Components 1.1
./qml/Panel/IndicatorsMenu.qml:18:import Ubuntu.Components 1.1
./qml/Panel/Handle.qml:18:import Ubuntu.Components 1.1
./qml/Panel/Panel.qml:18:import Ubuntu.Components 1.1
./qml/Panel/IndicatorItem.qml:18:import Ubuntu.Components 1.1
./qml/Panel/MenuContent.qml:19:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialLeft.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/Arrow.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialContent.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialRight.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialPage.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/Tick.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialLeftFinish.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/Slider.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/Tutorial.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialBottom.qml:18:import Ubuntu.Components 1.1
./qml/Tutorial/TutorialBottomFinish.qml:18:import Ubuntu.Components 1.1
./qml/Stages/DesktopStage.qml:20:import Ubuntu.Components 1.1
./qml/Stages/Splash.qml:18:import Ubuntu.Components 1.1
./qml/Stages/MainViewStyle.qml:17:import Ubuntu.Components 1.1
./qml/Stages/WindowMoveResizeArea.qml:20:import Ubuntu.Components 1.1
./qml/Stages/SpreadDelegate.qml:22:import Ubuntu.Components 1.1
./qml/Stages/SurfaceContainer.qml:18:import Ubuntu.Components 1.1
./qml/Stages/DecoratedWindow.qml:20:import Ubuntu.Components 1.1
./qml/Stages/PageHeadStyle.qml:17:import Ubuntu.Components 1.1
./qml/Stages/Animations/SwipeFromBottomAnimation.qml:18:import Ubuntu.Components 1.1
./qml/Stages/ApplicationWindow.qml:18:import Ubuntu.Components 1.1
./qml/Stages/WindowDecoration.qml:20:import Ubuntu.Components 1.1
./qml/Wizard/Pages.qml:18:import Ubuntu.Components 1.1
./qml/Wizard/Pages/10-welcome.qml:18:import Ubuntu.Components 1.1
./qml/Wizard/Pages/passwd-confirm.qml:18:import Ubuntu.Components 1.1
./qml/Wizard/Pages/passwd-set.qml:18:import Ubuntu.Components 1.1
./qml/Wizard/Wizard.qml:18:import Ubuntu.Components 1.1
./qml/Components/Dialogs.qml:21:import Ubuntu.Components 1.1
./qml/Components/Header.qml:17:import Ubuntu.Components 1.1
./qml/Components/PinPadButton.qml:18:import Ubuntu.Components 1.1
./qml/Components/ScrollCalculator.qml:18:import Ubuntu.Components 1.1
./qml/Components/WindowControlButtons.qml:20:import Ubuntu.Components 1.1
./qml/Components/Background.qml:18:import Ubuntu.Components 1.1
./qml/Component...

review: Needs Fixing

[lp:~dandrader/unity8/deprecatedTheme]

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

Move everything to Ubuntu.Components 1.3

Couldn't move Splash.qml though as its theme styling hack doesn't
work on 1.3

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

Fix other usages of the deprecated Theme context var

[Daniel d'Andrada (dandrader)]

> We need to update all files to 1.3 and test for regressions

Done. Tested on the phone and all seems fine.

Only place I couldn't change was Splash.qml as its theme styling hack doesn't work on 1.3. I think we should deal with it separately.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1809
http://jenkins.qa.ubuntu.com/job/unity8-ci/5826/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/119
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21280

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5826/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

The moment we switch to uitk 1.3 we need to update the deprecated APIs. UbuntuShape for example deprecates some APIs we were using before, as well as deprecating Shape (we can remove UbuntuShapeForItem). Maybe other components need tweaks

We also need to manually test for visible regressions

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 18/06/15 09:56, Andrea Cimitan wrote:
> We also need to manually test for visible regressions

I didn't spot any. Have you?

[Daniel d'Andrada (dandrader)]

On 18/06/15 09:56, Andrea Cimitan wrote:
> The moment we switch to uitk 1.3 we need to update the deprecated APIs.

No, we don't need to. They are deprecated, not removed. So everything
still works.
This branch only makes the updates to stop using the deprecated APIs
that were causing this deluge of warnings, namely the "Theme" context
property.

1.3 API just *add* new stuff, it doesn't remove anything.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1810
http://jenkins.qa.ubuntu.com/job/unity8-ci/5829/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/110
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21288

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5829/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Notifications/ShapedIcon.qml
1 conflicts encountered.

[lp:~dandrader/unity8/deprecatedTheme]

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

Merge trunk

[ Albert Astals Cid ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
* Support fallback images for dash card and preview widgets (LP:
  #1324142)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Fix Shell tests
[ Josh Arenson ]
* Refactor greeter emulator to unlock the greeter via dbus
[ Lukáš Tinkl ]
* respect target window's devicePixelRatio in MouseTouchAdaptor
[ Michael Zanetti ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
[ Michał Sawicz ]
* Refactor QmlTest.cmake module so that all tests can go through it.
  Also a bit of cleanup around tests.
[ handsome_feng ]
* Forbid closing apps during the edge gesture. (LP: #1445572)
* Removed the horizonal rule on pin unlock screen. (LP: #1368798)
[ handsome_feng<email address hidden> ]
* Forbid closing apps during the edge gesture. (LP: #1445572)
* No-change rebuild against Qt 5.4.2.

[Daniel d'Andrada (dandrader)]

On 22/06/15 06:44, Albert Astals Cid wrote:
> Text conflict in qml/Notifications/ShapedIcon.qml
> 1 conflicts encountered.

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1811
http://jenkins.qa.ubuntu.com/job/unity8-ci/5856/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/137
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/157
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21399

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5856/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Wizard/Pages/50-location.qml
1 conflicts encountered.

[lp:~dandrader/unity8/deprecatedTheme]

1812. By Daniel d'Andrada <dandrader@panzer> on 2015-07-06

Merge trunk

[ Albert Astals Cid ]
* Save screenshots of suspended apps to disk
* Set width of title label when inside the title row (LP: #1461979)
* qmluitests was renamed to uitests
[ CI Train Bot ]
* Resync trunk.
[ Daniel d'Andrada ]
* Fix tst_OrientedShell and tst_Tutorial (LP: #1469761, #1466947)
[ Leo Arias ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Leonardo Arias Fonseca ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Lukáš Tinkl ]
* fix PO files extraction
[ Michael Zanetti ]
* Make use of QInputDeviceInfo in order to automatically switch
  between usage modes and hide the OSK.
[ Nick Dedekind ]
* Fixed qtmultimedia mock which was generating errors in tests
[ Richard Huddie ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
* Implement full-shell rotation (LP: #1210199)

[Daniel d'Andrada (dandrader)]

On 06/07/15 04:24, Albert Astals Cid wrote:
> Text conflict in qml/Wizard/Pages/50-location.qml
> 1 conflicts encountered.

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1812
http://jenkins.qa.ubuntu.com/job/unity8-ci/5943/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/224
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/266
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21670

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5943/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

A more complete replacement in https://code.launchpad.net/~aacid/unity8/use_sdk_13/+merge/264392

review: Disapprove

Unmerged revisions

=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2015-02-12 16:28:36 +0000
+++ plugins/Dash/CardAttributes.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 GridLayout {
     id: grid
@@ -27,7 +27,7 @@
     columns: 2 + repeater.count % 2
     rowSpacing: units.gu(.5)
     property alias model: repeater.model
-    property color color: Theme.palette.normal.baseText
+    property color color: theme.palette.normal.baseText
     property real fontScale: 1.0
 
     Repeater {

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-07-02 16:09:39 +0000
+++ plugins/Dash/CardCreator.js	2015-07-06 13:00:44 +0000
@@ -480,20 +480,20 @@
         }
     }
 
-    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
 
     var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
     var titleSubtitleCode = '';
     if (hasTitle) {
         var titleColor;
         if (headerAsOverlay) {
-            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
         } else if (hasSummary) {
             titleColor = 'summary.color';
         } else if (hasBackground) {
             titleColor = summaryColorWithBackground;
         } else {
-            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var titleAnchors;
@@ -649,7 +649,7 @@
         if (hasBackground) {
             summaryColor = summaryColorWithBackground;
         } else {
-            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -698,7 +698,7 @@
 
 function createCardComponent(parent, template, components) {
     var imports = 'import QtQuick 2.2; \n\
-                   import Ubuntu.Components 1.1; \n\
+                   import Ubuntu.Components 1.3; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
                    import Dash 0.1;\n\
                    import Utils 0.1;\n';

=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ plugins/Dash/ScopeStyle.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import Utils 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! \brief Helper for processing scope customization options.
 

=== modified file 'qml/Components/Background.qml'
--- qml/Components/Background.qml	2014-08-29 08:47:21 +0000
+++ qml/Components/Background.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1 as Utils
 
 Loader {

=== modified file 'qml/Components/BaseCarouselDelegate.qml'
--- qml/Components/BaseCarouselDelegate.qml	2014-07-08 17:49:18 +0000
+++ qml/Components/BaseCarouselDelegate.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*!
  \brief Base delegate for use with the Carousel component

=== modified file 'qml/Components/Carousel.qml'
--- qml/Components/Carousel.qml	2015-01-14 09:51:39 +0000
+++ qml/Components/Carousel.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "carousel.js" as CarouselJS
 
 /*! The Carousel component presents the items of a model in a carousel view. It's similar to a

=== modified file 'qml/Components/DelayedLockscreen.qml'
--- qml/Components/DelayedLockscreen.qml	2015-02-12 14:48:06 +0000
+++ qml/Components/DelayedLockscreen.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-03-26 15:24:04 +0000
+++ qml/Components/Dialogs.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 
 import Unity.Application 0.1
 import Unity.Session 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import LightDM 0.1 as LightDM
 
 Item {

=== modified file 'qml/Components/DragHandle.qml'
--- qml/Components/DragHandle.qml	2015-04-10 21:16:37 +0000
+++ qml/Components/DragHandle.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/DraggingArea.qml'
--- qml/Components/DraggingArea.qml	2014-07-11 09:22:59 +0000
+++ qml/Components/DraggingArea.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: draggingArea

=== modified file 'qml/Components/EdgeDragEvaluator.qml'
--- qml/Components/EdgeDragEvaluator.qml	2015-04-27 15:30:18 +0000
+++ qml/Components/EdgeDragEvaluator.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/Header.qml'
--- qml/Components/Header.qml	2014-08-01 16:13:53 +0000
+++ qml/Components/Header.qml	2015-07-06 13:00:44 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes.Ambiance 1.1
 
 PageHeadStyle {

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2014-10-01 13:20:32 +0000
+++ qml/Components/InputMethod.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'qml/Components/LazyImage.qml'
--- qml/Components/LazyImage.qml	2014-09-29 20:55:54 +0000
+++ qml/Components/LazyImage.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Components/ListItems/Header.qml'
--- qml/Components/ListItems/Header.qml	2014-07-16 16:30:15 +0000
+++ qml/Components/ListItems/Header.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     property alias text: label.text

=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PassphraseLockscreen.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2015-05-28 07:42:09 +0000
+++ qml/Components/PinLockscreen.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1
 import "../Components"
 

=== modified file 'qml/Components/PinPadButton.qml'
--- qml/Components/PinPadButton.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PinPadButton.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root

=== modified file 'qml/Components/Rating.qml'
--- qml/Components/Rating.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/Rating.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! Rating widget bar. */
 

=== modified file 'qml/Components/RatingStyle.qml'
--- qml/Components/RatingStyle.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/RatingStyle.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Row {
     anchors.fill: parent

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-10-23 11:59:22 +0000
+++ qml/Components/ResponsiveGridView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*
    Essentially a GridView where you can specify the maximum number of columns it can have.

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2015-05-12 10:05:52 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 import Dash 0.1
 

=== modified file 'qml/Components/ScrollCalculator.qml'
--- qml/Components/ScrollCalculator.qml	2014-10-13 15:09:46 +0000
+++ qml/Components/ScrollCalculator.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: scrollArea

=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2014-12-08 13:39:01 +0000
+++ qml/Components/ShellDialog.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 0.1
 
 /*

=== modified file 'qml/Components/UbuntuShapeForItem.qml'
--- qml/Components/UbuntuShapeForItem.qml	2014-10-06 07:39:42 +0000
+++ qml/Components/UbuntuShapeForItem.qml	2015-07-06 13:00:44 +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 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
+++ qml/Components/WindowControlButtons.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Row {
     id: root

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Components/ZoomableImage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 /*! \brief Zoomable for image.

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardCarousel.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardHorizontalList.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardVerticalJournal.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-05-18 23:04:12 +0000
+++ qml/Dash/Dash.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity 0.2
 import Utils 0.1

=== modified file 'qml/Dash/DashCategoryBase.qml'
--- qml/Dash/DashCategoryBase.qml	2014-10-09 17:41:49 +0000
+++ qml/Dash/DashCategoryBase.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     width: parent.width

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-03-19 15:25:45 +0000
+++ qml/Dash/DashContent.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigation.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components"
 
@@ -48,7 +48,7 @@
         id: d
         readonly property color foregroundColor: root.scopeStyle
                                                  ? root.scopeStyle.getTextColor(backgroundItem.luminance)
-                                                 : Theme.palette.normal.baseText
+                                                 : theme.palette.normal.baseText
         readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
         readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
         readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigationButton.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root
@@ -24,7 +24,7 @@
     // Set by parent
     property var scope: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     property bool isAltNavigation: false
     property bool showDivider: false
 

=== modified file 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashNavigationList.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/DashNavigationList.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {
@@ -23,7 +23,7 @@
     property var navigation: null
     property var currentNavigation: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     signal enterNavigation(var newNavigationId, bool hasChildren)
     signal goBackToParentClicked()
     signal allNavigationClicked()

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-06-16 15:12:33 +0000
+++ qml/Dash/GenericScopeView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity 0.2
 import Dash 0.1
@@ -536,7 +536,7 @@
                     }
                     fontSize: "small"
                     font.weight: Font.Bold
-                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                    color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                 }
             }
 
@@ -573,7 +573,7 @@
             width: categoryView.width
             height: section != "" ? units.gu(5) : 0
             text: section
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             iconName: delegate && delegate.headerLink ? "go-next" : ""
             onClicked: {
                 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
@@ -694,7 +694,7 @@
             }
             fontSize: "small"
             font.weight: Font.Bold
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         Connections {

=== modified file 'qml/Dash/PageHeader.qml'
--- qml/Dash/PageHeader.qml	2015-03-13 10:07:57 +0000
+++ qml/Dash/PageHeader.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes.Ambiance 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
@@ -182,7 +182,7 @@
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
                 property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: "back"
                         onTriggered: {
@@ -256,7 +256,7 @@
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
                 property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: backIsClose ? "close" : "back"
                         visible: root.showBackButton

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/PreviewListView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "Previews" as Previews

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-02-12 10:44:27 +0000
+++ qml/Dash/Previews/Preview.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! \brief This component constructs the Preview UI.
  *

=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
--- qml/Dash/Previews/PreviewActionButton.qml	2014-08-14 12:01:03 +0000
+++ qml/Dash/Previews/PreviewActionButton.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Button {
     signal triggeredAction(var actionData)

=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	2014-08-15 08:40:36 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root
@@ -33,7 +33,7 @@
 
         objectName: "moreLessButton"
         text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
-        strokeColor: Theme.palette.normal.baseText
+        strokeColor: theme.palette.normal.baseText
         onClicked: expanded = !expanded
         width: parent.width
     }

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2015-02-12 10:44:27 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! This preview widget shows either one button, two buttons or one button
  *  and a combo button depending on the number of items in widgetData["actions"].
@@ -50,7 +50,7 @@
             Binding {
                 target: loader.item
                 property: "strokeColor"
-                value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             }
             Connections {
                 target: loader.item

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2014-08-13 10:29:21 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtMultimedia 5.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! \brief Preview widget for audio tracks.
 
@@ -139,7 +139,7 @@
                             objectName: "trackTitleLabel"
                             anchors { top: parent.top; left: parent.left; right: parent.right }
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
                             text: modelData["title"]
@@ -152,7 +152,7 @@
                             anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
                             visible: text !== ""
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             font.weight: Font.Light
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
@@ -193,7 +193,7 @@
                         anchors.verticalCenter: parent.verticalCenter
                         width: parent.column3Width
                         opacity: 0.9
-                        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                         fontSize: "small"
                         horizontalAlignment: Text.AlignRight
                         text: audio.lengthToString(modelData["length"])

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2014-08-26 10:54:49 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for expandable widgets.
@@ -41,7 +41,7 @@
             right: expandButton.left
         }
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -62,7 +62,7 @@
             width: units.gu(3)
             height: units.gu(3)
             name: root.expanded ? "view-collapse" : "view-expand"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         }
     }
 

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../"
 
@@ -40,7 +40,7 @@
         readonly property string title: root.widgetData["title"] || ""
         readonly property string subtitle: root.widgetData["subtitle"] || ""
         readonly property var attributes: root.widgetData["attributes"] || null
-        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
 
         // Rewire the source since we may have unwired it on onStatusChanged
         onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;

=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! This preview widget shows a horizontal list of images.

=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
--- qml/Dash/Previews/PreviewOverlay.qml	2015-03-10 12:23:46 +0000
+++ qml/Dash/Previews/PreviewOverlay.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Rectangle {
@@ -158,7 +158,7 @@
                 anchors.centerIn: parent
                 width: units.gu(2.5)
                 height: width
-                color: Theme.palette.normal.foregroundText
+                color: theme.palette.normal.foregroundText
                 name: "close"
             }
         }

=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
--- qml/Dash/Previews/PreviewPayments.qml	2014-11-20 11:44:44 +0000
+++ qml/Dash/Previews/PreviewPayments.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Payments 0.1
 
 /*! \brief Preview widget for a purchase button.

=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
--- qml/Dash/Previews/PreviewProgress.qml	2014-04-30 10:51:30 +0000
+++ qml/Dash/Previews/PreviewProgress.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.DownloadDaemonListener 0.1
 
 /*! \brief Preview widget for a progress bar.

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-05-11 07:33:41 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating display.
@@ -60,7 +60,7 @@
                 urlIconEmpty: widgetData["rating-icon-empty"]
                 urlIconFull: widgetData["rating-icon-full"]
                 urlIconHalf: widgetData["rating-icon-half"]
-                labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             }
         }
     }

=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for editable rating.
@@ -56,7 +56,7 @@
         urlIconEmpty: widgetData["rating-icon-empty"]
         urlIconFull: widgetData["rating-icon-full"]
         urlIconHalf: widgetData["rating-icon-half"]
-        labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     PreviewRatingInput {

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating.
@@ -79,7 +79,7 @@
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["rating-label"] || i18n.tr("Rate this")
         }
@@ -124,7 +124,7 @@
                 left: parent.left
                 right: parent.right
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["review-label"] || i18n.tr("Add a review")
         }
@@ -165,7 +165,7 @@
                     top: parent.top
                     right: parent.right
                 }
-                color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
+                color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
                 text: widgetData["submit-label"] || i18n.tr("Send")
                 onClicked: {
                     if (readyToSubmit) root.submit()

=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Column {

=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	2015-04-13 10:37:41 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for table.
@@ -48,7 +48,7 @@
             }
             height: visible ? implicitHeight : 0
             fontSize: "large"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             visible: text !== ""
             opacity: .8
             text: widgetData["title"] || ""
@@ -72,7 +72,7 @@
                         fontSize: "small"
                         text: perRowRepeater.model[index]
                         visible: root.expanded || rowIndex < maximumCollapsedRowCount
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
                         font.bold: index == 0
                         wrapMode: Text.Wrap
                         Layout.alignment: Qt.AlignTop

=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml	2014-10-10 10:37:03 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for text.
@@ -39,7 +39,7 @@
         }
         height: visible ? implicitHeight : 0
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -61,7 +61,7 @@
         clip: true
         fontSize: "small"
         lineHeight: 1.2
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         opacity: .8
         text: widgetData["text"] || ""
         wrapMode: Text.Wrap

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2014-03-31 13:06:36 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for image.

=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
--- qml/Dash/PullToRefreshScopeStyle.qml	2014-09-30 14:22:22 +0000
+++ qml/Dash/PullToRefreshScopeStyle.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.1
 
 /**

=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
--- qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! Interface for settings widgets. */
 

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-02-10 11:35:11 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ScopeSetting {
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         CheckBox {

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ScopeSetting {

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
--- qml/Dash/ScopeSettings/ScopeSettingString.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ScopeSetting {
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         TextField {
@@ -57,7 +57,7 @@
             }
             width: root.mode == "number" ? units.gu(8) : units.gu(12)
             text: widgetData.value
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText
             validator: root.mode == "number" ? doubleValidator : null
             hasClearButton: root.mode == "number" ? false : true
 

=== modified file 'qml/Dash/ScopeSettingsPage.qml'
--- qml/Dash/ScopeSettingsPage.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "ScopeSettings"

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2015-04-24 07:33:59 +0000
+++ qml/Dash/ScopesListCategory.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components/ListItems" as ListItems
 
@@ -43,7 +43,7 @@
         id: header
         width: root.width
         height: units.gu(5)
-        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     readonly property double listItemHeight: units.gu(6)

=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml	2015-02-13 12:03:32 +0000
+++ qml/Dash/ScopesListCategoryItem.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: root

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-12-11 14:10:18 +0000
+++ qml/Greeter/Clock.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../Panel/Indicators"
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2015-05-11 14:36:03 +0000
+++ qml/Greeter/CoverPage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-06-12 16:07:43 +0000
+++ qml/Greeter/Greeter.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.3
 import AccountsService 0.1
 import LightDM 0.1 as LightDM
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import "../Components"

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2015-02-12 14:48:06 +0000
+++ qml/Greeter/Infographics.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import "../Components"
 import "Gradient.js" as Gradient
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: infographic

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2015-02-01 19:53:29 +0000
+++ qml/Greeter/LoginList.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-03-04 13:23:34 +0000
+++ qml/Greeter/NarrowView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Greeter/ObjectPositioner.qml'
--- qml/Greeter/ObjectPositioner.qml	2013-06-05 22:03:08 +0000
+++ qml/Greeter/ObjectPositioner.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     property int count

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2015-03-04 13:23:34 +0000
+++ qml/Greeter/WideView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 FocusScope {
     id: root

=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
--- qml/Launcher/FoldingLauncherDelegate.qml	2013-08-27 18:30:55 +0000
+++ qml/Launcher/FoldingLauncherDelegate.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 LauncherDelegate {
     id: root

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2015-04-15 20:21:11 +0000
+++ qml/Launcher/Launcher.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Launcher 0.1
 

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-10-14 12:28:07 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-04-17 13:31:27 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 0.1

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-01-21 17:19:13 +0000
+++ qml/Notifications/Notification.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtMultimedia 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Notifications 1.0
 import QMenuModel 0.1
 import Utils 0.1
@@ -269,7 +269,7 @@
                         }
                         visible: type !== Notification.Confirmation
                         fontSize: "medium"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         elide: Text.ElideRight
                         textFormat: Text.PlainText
                     }
@@ -284,7 +284,7 @@
                         }
                         visible: body != "" && type !== Notification.Confirmation
                         fontSize: "small"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         wrapMode: Text.WordWrap
                         maximumLineCount: type == Notification.SnapDecision ? 12 : 2
                         elide: Text.ElideRight
@@ -325,7 +325,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 visible: type === Notification.Confirmation && body !== ""
                 fontSize: "medium"
-                color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                 wrapMode: Text.WordWrap
                 maximumLineCount: 1
                 elide: Text.ElideRight

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-11-17 13:46:56 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import QMenuModel 0.1
 import "../Components"
 

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2015-01-20 18:49:03 +0000
+++ qml/Notifications/Notifications.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Notifications 1.0 as UnityNotifications
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Notifications/OptionToggle.qml'
--- qml/Notifications/OptionToggle.qml	2014-11-07 10:55:22 +0000
+++ qml/Notifications/OptionToggle.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
 
@@ -29,7 +29,7 @@
 
     signal triggered(string id)
 
-    color: Theme.palette.normal.base
+    color: theme.palette.normal.base
     borderSource: "none"
     height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
     width: parent.width

=== modified file 'qml/Notifications/ShapedIcon.qml'
--- qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:26 +0000
+++ qml/Notifications/ShapedIcon.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     property string fileSource

=== modified file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	2015-03-17 11:02:43 +0000
+++ qml/Notifications/SwipeToAct.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: swipeToAct

=== modified file 'qml/Panel/ActiveCallHint.qml'
--- qml/Panel/ActiveCallHint.qml	2014-10-08 21:05:50 +0000
+++ qml/Panel/ActiveCallHint.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Telephony 0.1 as Telephony
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 

=== modified file 'qml/Panel/Handle.qml'
--- qml/Panel/Handle.qml	2014-10-09 12:01:57 +0000
+++ qml/Panel/Handle.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: handle

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-02-12 16:28:36 +0000
+++ qml/Panel/IndicatorItem.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import "Indicators"
 

=== modified file 'qml/Panel/IndicatorItemRow.qml'
--- qml/Panel/IndicatorItemRow.qml	2014-10-17 14:55:35 +0000
+++ qml/Panel/IndicatorItemRow.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2014-11-17 23:04:48 +0000
+++ qml/Panel/IndicatorPage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Components
+import Ubuntu.Components 1.3 as Components
 import Unity.Indicators 0.1 as Indicators
 import "Indicators"
 

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-06-13 11:30:34 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@
 import QMenuModel 0.1
 import Utils 0.1 as Utils
 import Ubuntu.Components.ListItems 0.1 as ListItems
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: menuFactory
@@ -245,7 +245,7 @@
                     name: "settings"
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -277,7 +277,7 @@
                     source: menuData.icon
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -836,7 +836,7 @@
             enabled: menuData && menuData.sensitive || false
             highlightWhenPressed: false
             text: menuData && menuData.label || ""
-            foregroundColor: Theme.palette.normal.backgroundText
+            foregroundColor: theme.palette.normal.backgroundText
 
             onMenuModelChanged: {
                 loadAttributes();

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-03-13 10:07:57 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1 as QMenuModel
 import Utils 0.1 as Utils

=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
--- qml/Panel/Indicators/ModemInfoItem.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/ModemInfoItem.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 ListItem.Empty {
@@ -65,7 +65,7 @@
                 height: parent.height
                 Icon {
                     id: statusIcon
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight
@@ -75,7 +75,7 @@
 
                 Icon {
                     id: iconConnectivity
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
--- qml/Panel/Indicators/RoamingIndication.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/RoamingIndication.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 RowLayout {
     spacing: units.gu(0.5)
@@ -30,7 +30,7 @@
 
     Icon {
         id: iconRoaming
-        color: Theme.palette.selected.backgroundText
+        color: theme.palette.selected.backgroundText
 
         Layout.preferredHeight: parent.height
         Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2014-10-03 10:10:31 +0000
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../.."
 

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2014-07-25 17:52:39 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Rectangle {
@@ -26,7 +26,7 @@
     id: root
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
     }
 
     PageStack {

=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
--- qml/Panel/Indicators/client/IndicatorsList.qml	2015-03-11 08:07:31 +0000
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Unity.Indicators 0.1 as Indicators
 import "../.."

=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2014-11-11 15:28:13 +0000
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import ".."
 

=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2014-12-03 10:57:01 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-05-18 23:04:12 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "Indicators"

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-11-17 23:04:48 +0000
+++ qml/Panel/MenuContent.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-04-15 11:37:00 +0000
+++ qml/Panel/Panel.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"

=== modified file 'qml/Rotation/RotationStates.qml'
--- qml/Rotation/RotationStates.qml	2015-05-11 14:36:03 +0000
+++ qml/Rotation/RotationStates.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Powerd 0.1
 
 // Why the state machine is done that way:

=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-08-07 15:29:12 +0000
+++ qml/ScopeTool.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
 */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 import Utils 0.1

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-06-23 17:40:03 +0000
+++ qml/Shell.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import AccountsService 0.1
 import GSettings 1.0
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Gestures 0.1
 import Ubuntu.Telephony 0.1 as Telephony
@@ -160,7 +160,7 @@
     }
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
         if (ApplicationManager.count > 0) {
             ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
         }

=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	2014-09-01 12:46:31 +0000
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 BaseSessionAnimation {
     id: animation

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-06-22 09:37:50 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import SessionGrabber 0.1
 

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-04-24 17:42:11 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 FocusScope {

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-06-12 16:07:43 +0000
+++ qml/Stages/DesktopStage.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components/PanelState"
 

=== modified file 'qml/Stages/MainViewStyle.qml'
--- qml/Stages/MainViewStyle.qml	2014-09-12 20:16:54 +0000
+++ qml/Stages/MainViewStyle.qml	2015-07-06 13:00:44 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
 Item {

=== modified file 'qml/Stages/PageHeadStyle.qml'
--- qml/Stages/PageHeadStyle.qml	2014-08-27 18:50:43 +0000
+++ qml/Stages/PageHeadStyle.qml	2015-07-06 13:00:44 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.1 as Style
 
 // FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-06-23 14:20:23 +0000
+++ qml/Stages/PhoneStage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Unity.Session 0.1

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-06-22 09:37:50 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-04-15 11:37:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
 */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1 // For TouchGate
 import Utils 0.1 // for InputWatcher
 

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-06-23 14:20:23 +0000
+++ qml/Stages/TabletStage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Utils 0.1

=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
--- qml/Stages/TransformedSpreadDelegate.qml	2015-04-28 20:20:23 +0000
+++ qml/Stages/TransformedSpreadDelegate.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 SpreadDelegate {
     id: root

=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-03-06 04:44:11 +0000
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 SpreadDelegate {

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2015-03-13 19:18:35 +0000
+++ qml/Stages/WindowDecoration.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Stages/WindowMoveResizeArea.qml'
--- qml/Stages/WindowMoveResizeArea.qml	2015-03-13 19:01:32 +0000
+++ qml/Stages/WindowMoveResizeArea.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 MouseArea {

=== modified file 'qml/Tutorial/Arrow.qml'
--- qml/Tutorial/Arrow.qml	2014-12-18 23:32:42 +0000
+++ qml/Tutorial/Arrow.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Slider.qml'
--- qml/Tutorial/Slider.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/Slider.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Tick.qml'
--- qml/Tutorial/Tick.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/Tick.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     implicitHeight: tick.height

=== modified file 'qml/Tutorial/Tutorial.qml'
--- qml/Tutorial/Tutorial.qml	2015-04-03 14:23:02 +0000
+++ qml/Tutorial/Tutorial.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialBottom.qml'
--- qml/Tutorial/TutorialBottom.qml	2015-04-10 21:16:37 +0000
+++ qml/Tutorial/TutorialBottom.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "." as LocalComponents

=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
--- qml/Tutorial/TutorialBottomFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialBottomFinish.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2015-04-03 14:23:02 +0000
+++ qml/Tutorial/TutorialContent.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-01-09 17:58:05 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
--- qml/Tutorial/TutorialLeftFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialLeftFinish.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialPage.qml'
--- qml/Tutorial/TutorialPage.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/TutorialPage.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Showable {

=== modified file 'qml/Tutorial/TutorialRight.qml'
--- qml/Tutorial/TutorialRight.qml	2015-02-18 21:31:54 +0000
+++ qml/Tutorial/TutorialRight.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import "../Components"

=== modified file 'qml/Wizard/CheckableSetting.qml'
--- qml/Wizard/CheckableSetting.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/CheckableSetting.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Empty {
@@ -77,7 +77,7 @@
                 rightMargin: listItem.rightMargin
             }
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: listItem.linkActivated(link)
         }
     }

=== modified file 'qml/Wizard/Page.qml'
--- qml/Wizard/Page.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Page.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     readonly property real buttonMargin: units.gu(2)
@@ -57,7 +57,7 @@
         }
         wrapMode: Text.Wrap
         text: title
-        color: Theme.palette.normal.baseText
+        color: theme.palette.normal.baseText
         font.pixelSize: units.gu(4)
     }
 

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2015-03-03 14:42:10 +0000
+++ qml/Wizard/Pages.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Wizard 0.1
 import "../Components"

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
 import Wizard 0.1

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- qml/Wizard/Pages/20-sim.qml	2015-02-19 18:53:47 +0000
+++ qml/Wizard/Pages/20-sim.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import MeeGo.QOfono 0.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
@@ -111,13 +111,13 @@
 
             Component.onCompleted: {
                 // A visible selected background looks bad in ListItem widgets with our theme
-                originalBackground = Theme.palette.selected.background
-                Theme.palette.selected.background = "transparent"
+                originalBackground = theme.palette.selected.background
+                theme.palette.selected.background = "transparent"
             }
 
             Component.onDestruction: {
                 // Restore original theme background
-                Theme.palette.selected.background = originalBackground
+                theme.palette.selected.background = originalBackground
             }
         }
     }

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- qml/Wizard/Pages/40-wifi.qml	2015-02-03 15:00:26 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QMenuModel 0.1 as QMenuModel
 import QtSystemInfo 5.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Settings.Menus 0.1 as Menus
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- qml/Wizard/Pages/50-location.qml	2015-06-22 10:01:15 +0000
+++ qml/Wizard/Pages/50-location.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 import AccountsService 0.1
 import QMenuModel 0.1 as QMenuModel
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {
@@ -98,7 +98,7 @@
                 anchors.leftMargin: hereCheck.labelOffset
                 anchors.right: parent.right
                 wrapMode: Text.Wrap
-                linkColor: Theme.palette.normal.foregroundText
+                linkColor: theme.palette.normal.foregroundText
                 // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
                 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
                 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- qml/Wizard/Pages/60-reporting.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/80-finished.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- qml/Wizard/Pages/here-terms.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/here-terms.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 import QtQuick 2.3
 import AccountsService 0.1
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Web 0.2
 import ".." as LocalComponents
 
@@ -102,7 +102,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: {
                 webview.url = link
                 termsLabel.visible = false

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- qml/Wizard/Pages/passwd-confirm.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- qml/Wizard/Pages/passwd-set.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/StackButton.qml'
--- qml/Wizard/StackButton.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/StackButton.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: stackButton
@@ -32,7 +32,7 @@
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.right: parent.right
-        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
+        color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)
         text: {
             if (backArrow) {
                 // Translators: This is the arrow for "Back" buttons

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2015-03-11 14:48:45 +0000
+++ qml/Wizard/Wizard.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Wizard 0.1
 import "../Components"
 

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2015-07-06 13:00:44 +0000
@@ -87,7 +87,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2015-07-06 13:00:44 +0000
@@ -88,7 +88,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -108,7 +108,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2015-07-06 13:00:44 +0000
@@ -87,7 +87,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -107,7 +107,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2015-07-06 13:00:44 +0000
@@ -72,7 +72,7 @@
                     wrapMode: Text.Wrap; 
                     maximumLineCount: 2; 
                     font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                    color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                     visible: showHeader ; 
                     width: undefined;
                     text: root.title; 
@@ -92,7 +92,7 @@
                         maximumLineCount: 1; 
                         fontSize: "x-small"; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: titleLabel.visible && titleLabel.text; 
                         text: cardData && cardData["subtitle"] || ""; 
                         font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-07-06 13:00:44 +0000
@@ -131,7 +131,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader && overlayLoader.active; 
                         width: undefined;
                         text: root.title; 
@@ -152,7 +152,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2015-07-06 13:00:44 +0000
@@ -67,7 +67,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -87,7 +87,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -101,7 +101,7 @@
                             rightMargin: units.gu(1); 
                             } 
                             source: cardData && cardData["emblem"] || ""; 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             height: source != "" ? titleLabel.font.pixelSize : 0; 
                             width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
                         }

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2015-07-06 13:00:44 +0000
@@ -89,7 +89,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -109,7 +109,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -122,7 +122,7 @@
                             rightMargin: units.gu(1);
                             top: subtitleLabel.bottom; 
                             } 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             fontScale: root.fontScale; 
                             model: cardData && cardData["attributes"]; 
                           }

=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2014-10-31 15:13:24 +0000
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import Dash 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
 

=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     objectName: "rightwardsLauncher"

=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-04-17 14:21:43 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Test 0.1
 

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2013-11-22 13:43:40 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
--- tests/qmltests/Components/tst_Dialogs.qml	2015-03-26 15:39:30 +0000
+++ tests/qmltests/Components/tst_Dialogs.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
--- tests/qmltests/Components/tst_DragHandle.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import "../../../qml/Components"
 import "tst_DragHandle"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Test 0.1
 

=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Showable {

=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "../../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Showable {

=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
--- tests/qmltests/Components/tst_LazyImage.qml	2014-08-13 10:29:21 +0000
+++ tests/qmltests/Components/tst_LazyImage.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "tst_LazyImage"
 
@@ -32,7 +32,7 @@
             rightMargin: 2 * parent.width / 3
         }
 
-        color: Theme.palette.normal.baseText
+        color: theme.palette.normal.baseText
 
         Column {
             anchors { fill: parent; margins: units.gu(5) }

=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2013-12-17 16:04:47 +0000
+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Components"
 
 Row {

=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
--- tests/qmltests/Components/tst_Lockscreen.qml	2015-03-18 12:32:08 +0000
+++ tests/qmltests/Components/tst_Lockscreen.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Rectangle {

=== modified file 'tests/qmltests/Components/tst_Rating.qml'
--- tests/qmltests/Components/tst_Rating.qml	2014-02-13 17:00:06 +0000
+++ tests/qmltests/Components/tst_Rating.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,14 +17,14 @@
 import QtQuick 2.0
 import QtTest 1.0
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Rectangle {
     id: root
     width: units.gu(40)
     height: units.gu(10)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     Rating {
         id: rating

=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2014-01-27 18:03:45 +0000
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import ".."
 import "../../../qml/Components"
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2014-12-19 14:51:35 +0000
+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import ".."
 import "../../../qml/Components"
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Components/tst_Showable.qml'
--- tests/qmltests/Components/tst_Showable.qml	2015-04-10 15:10:51 +0000
+++ tests/qmltests/Components/tst_Showable.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2015-03-12 16:08:14 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(60)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     Item {
         id: shell

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 
 Rectangle {

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 import QtMultimedia 5.0
@@ -25,7 +25,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var tracksModel0: {
         "tracks": [ ]

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property string longText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
     property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-01-09 09:40:52 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2014-02-12 16:28:08 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var reviewsModel0: {
         "reviews": [ ]

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
 

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-02-17 15:06:33 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property real validInputRating: 1
     property real invalidInputRating: -1

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-04-13 11:08:53 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetDataComplete: {
         "title": "Title here longa long long long long long long long long long long",

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2014-08-01 09:55:04 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
 
@@ -24,7 +24,7 @@
     id: root
     width: units.gu(40)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     property var widgetDataComplete: {
         "title": "Title here",

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-08-26 19:21:31 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(80)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     PreviewWidgetFactory {
         id: factory

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2014-08-27 08:07:33 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2014-08-26 14:21:29 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2015-06-18 19:39:17 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "../../../qml/Dash"
 import "CardHelpers.js" as Helpers
@@ -522,7 +522,7 @@
 
             background.color = data.tag;
 
-            var fontColor = data.dark ? Theme.palette.normal.baseText : "white";
+            var fontColor = data.dark ? theme.palette.normal.baseText : "white";
 
             tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
             tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);

=== modified file 'tests/qmltests/Dash/tst_CardBenchmark.qml'
--- tests/qmltests/Dash/tst_CardBenchmark.qml	2014-05-02 14:57:27 +0000
+++ tests/qmltests/Dash/tst_CardBenchmark.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "../../../qml/Dash"
 import "CardHelpers.js" as Helpers

=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
--- tests/qmltests/Dash/tst_CardTool.qml	2014-09-05 07:27:00 +0000
+++ tests/qmltests/Dash/tst_CardTool.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "../../../qml/Dash"
 import "CardHelpers.js" as Helpers

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2015-03-27 12:30:24 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import "../../../qml/Dash"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2015-05-07 10:32:17 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../qml/Dash"
 import "../../../qml/Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import Unity.Test 0.1 as UT
 import Utils 0.1

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-06-16 15:12:28 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-07-06 13:00:44 +0000
@@ -20,7 +20,7 @@
 import ".."
 import "../../../qml/Dash"
 import "../../../qml/Components"
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
--- tests/qmltests/Dash/tst_PageHeader.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/tst_PageHeader.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Dash"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity 0.2
 import Unity.Test 0.1 as UT
 
@@ -244,7 +244,7 @@
             searchEntryEnabled: true
             title: "%^$%^%^&%^&%^$%GHR%"
             scopeStyle: QtObject {
-                readonly property color foreground: Theme.palette.normal.baseText
+                readonly property color foreground: theme.palette.normal.baseText
                 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
             }
             showBackButton: showBackButtonCheckBox.checked

=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
--- tests/qmltests/Dash/tst_PreviewListView.qml	2015-03-20 17:31:23 +0000
+++ tests/qmltests/Dash/tst_PreviewListView.qml	2015-07-06 13:00:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../../../qml/Dash"
 import Unity.Test 0.1 as UT
 import Unity 0.2 as Unity
@@ -26,7 +26,7 @@
     id: root
     width: units.gu(60)
     height: units.gu(60)
-    color: Theme.palette.selected.background
+    color: theme.palette.selected.background
 
     Unity.MockScope {
         id: mockScope

=== modified file 'tests/qmltests/Greeter/TestView.qml'
--- tests/qmltests/Greeter/TestView.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/Greeter/TestView.qml	2015-07-06 13:00:44 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
--- tests/qmltests/Greeter/tst_Clock.qml	2014-10-17 14:55:35 +0000
+++ tests/qmltests/Greeter/tst_Clock.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-03-02 21:34:02 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import AccountsService 0.1
 import LightDM 0.1 as LightDM
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-01-20 11:50:19 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import LightDM 0.1 as LightDM
 

=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
--- tests/qmltests/Greeter/tst_NarrowView.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import ".."
 import "../../../qml/Greeter"
 import LightDM 0.1 as LightDM
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2015-03-10 17:59:41 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import ".."
 import "../../../qml/Greeter"
 import LightDM 0.1 as LightDM
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 Item {

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-04-24 09:53:37 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import ".."
 import "../../../qml/Launcher"
 import Unity.Launcher 0.1

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2015-02-13 11:40:07 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2015-07-06 13:00:44 +0000
@@ -21,7 +21,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Notifications"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 import Unity.Notifications 1.0
 import QtMultimedia 5.0

=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
--- tests/qmltests/Notifications/tst_OptionToggle.qml	2015-01-26 14:25:29 +0000
+++ tests/qmltests/Notifications/tst_OptionToggle.qml	2015-07-06 13:00:44 +0000
@@ -21,7 +21,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Notifications"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 import Unity.Notifications 1.0
 import QtMultimedia 5.0

=== modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-01-26 12:16:11 +0000
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Notifications"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 import Unity.Notifications 1.0
 

=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Notifications"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 import Unity.Notifications 1.0
 

=== modified file 'tests/qmltests/Panel/IndicatorTest.qml'
--- tests/qmltests/Panel/IndicatorTest.qml	2015-01-20 16:21:07 +0000
+++ tests/qmltests/Panel/IndicatorTest.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2014-12-11 14:10:18 +0000
+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Powerd 0.1
 import Lights 0.1
 import QMenuModel 0.1

=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2014-10-06 09:17:49 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import "../../../qml/Panel"
 

=== modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
--- tests/qmltests/Panel/tst_IndicatorItemRow.qml	2014-10-17 14:55:35 +0000
+++ tests/qmltests/Panel/tst_IndicatorItemRow.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
--- tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-03-06 04:44:11 +0000
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-04-15 11:37:00 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import Ubuntu.Telephony 0.1 as Telephony
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
--- tests/qmltests/Stages/ApplicationCheckBox.qml	2015-06-12 16:07:43 +0000
+++ tests/qmltests/Stages/ApplicationCheckBox.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 RowLayout {

=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
--- tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-02-12 18:58:35 +0000
+++ tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 ColumnLayout {

=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-06-22 09:37:50 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-07-06 13:00:44 +0000
@@ -20,7 +20,7 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 

=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-05-01 13:21:30 +0000
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-07-06 13:00:44 +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.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 import Unity.Test 0.1

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-06-23 14:20:23 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 Item {

=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
--- tests/qmltests/Stages/tst_SessionContainer.qml	2015-03-06 04:44:11 +0000
+++ tests/qmltests/Stages/tst_SessionContainer.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1 as UT
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../../../qml/Stages"
 

=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
--- tests/qmltests/Stages/tst_Splash.qml	2014-09-15 19:05:32 +0000
+++ tests/qmltests/Stages/tst_Splash.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 Rectangle {

=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-03-06 04:44:11 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 

=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
--- tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-06-25 19:24:41 +0000
+++ tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import Unity.Test 0.1
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 Rectangle {

=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-06-12 16:07:43 +0000
+++ tests/qmltests/Stages/tst_TabletStage.qml	2015-07-06 13:00:44 +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.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 import Unity.Test 0.1

=== modified file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml'
--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-05-01 10:24:08 +0000
+++ tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-07-06 13:00:44 +0000
@@ -20,7 +20,7 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../qml/Stages"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-06-23 14:05:51 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-07-06 13:00:44 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import AccountsService 0.1
 import LightDM 0.1 as LightDM
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 

=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	2015-03-03 14:42:10 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import AccountsService 0.1
 import MeeGo.QOfono 0.2
 import QMenuModel 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Unity.Test 0.1 as UT
 import Wizard 0.1
@@ -96,7 +96,7 @@
     }
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient";
+        theme.name = "Ubuntu.Components.Themes.SuruGradient";
         setup();
     }
 

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-06-23 17:40:03 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-07-06 13:00:44 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Unity.Application 0.1
 import Unity.Test 0.1

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-06-23 17:40:03 +0000
+++ tests/qmltests/tst_Shell.qml	2015-07-06 13:00:44 +0000
@@ -19,7 +19,7 @@
 import AccountsService 0.1
 import GSettings 1.0
 import LightDM 0.1 as LightDM
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Application 0.1

=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-04-13 13:12:18 +0000
+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 RowLayout {

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-06-22 12:36:47 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-07-06 13:00:44 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
 TestCase {