Merge lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Final UITK 1.2 Landing to Vivid

Final UITK 1.2 Landing to Vivid

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1428
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2185/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1622/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/669/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/786/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2185/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1429. By Zoltan Balogh on 2015-03-03

reverted

1430. By Zoltan Balogh on 2015-03-03

fix changelog

1431. By Zoltan Balogh on 2015-03-03

move 1.2

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1431
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2186/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1625
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1623
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18507
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/787/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2186/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1432. By Zoltan Balogh on 2015-03-03

update from staging

1433. By Zoltan Balogh on 2015-03-03

fixed changelog

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1433
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2187/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1630
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/671
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1628
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18514
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/788
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/788/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2187/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1434. By Zoltan Balogh on 2015-03-04

update from staging

1435. By Zoltan Balogh on 2015-03-04

solves this failure in Autopilot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2188/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1638
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1636
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18529
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/794
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/794/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2188/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2189/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1641
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18533
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/795
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/795/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2189/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1436. By Zoltan Balogh on 2015-03-05

pull lp:~tpeeters/ubuntu-ui-toolkit/vividFix

1437. By Zoltan Balogh on 2015-03-05

pull lp:~tpeeters/ubuntu-ui-toolkit/vividFix

1438. By Zoltan Balogh on 2015-03-05

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/addListItemsItemSelectorToExceptions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1656/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1469/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1654/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18572
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/803
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/803/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2190/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1439. By Zoltan Balogh on 2015-03-05

disable tst_tabs_with_repeater.deprecated_toolbar.qml tests

1440. By Zoltan Balogh on 2015-03-05

Ignore unit test failures and warnings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1439
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2191/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1658
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1656
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18575
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/804
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/804/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2191/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1440
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2192/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1659
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1657
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18576
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/805
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/805/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2192/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/uitk12_final_vivid_landing]

1441. By Zoltan Balogh on 2015-03-06

lp:~zsombi/ubuntu-ui-toolkit/langing-popoverfix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1441
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2193/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1677
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/695/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/17/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1675
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1675/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18616
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/555/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/813
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/813/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2193/rebuild

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2015-02-02 14:40:18 +0000
+++ .bzrignore	2015-03-06 08:22:20 +0000
@@ -2,6 +2,7 @@
 modules/Makefile.ubuntu-ui-toolkit
 modules/Ubuntu/Components/Makefile.ubuntu-ui-toolkit
 modules/Ubuntu/Components/plugin/Makefile.ubuntu-ui-toolkit
+modules/Ubuntu/Components/plugin/qrc_plugin.cpp
 documentation/html/*
 *.moc
 moc_*.cpp

=== modified file 'components.api'
--- components.api	2015-02-05 15:36:14 +0000
+++ components.api	2015-03-06 08:22:20 +0000
@@ -34,6 +34,11 @@
     property Gradient gradient
     property font font
     property string iconPosition
+Captions 1.2
+ColumnLayout
+    property int captionStyle
+    property Label title
+    property Label subtitle
 CheckBox 0.1 1.0
 AbstractButton
     property bool checked
@@ -62,6 +67,11 @@
     property string fadeStyle
     readonly property bool running
     readonly property int status
+Haptics 0.1 1.0
+Object
+    readonly property bool enabled
+    property HapticsEffect effect
+    function play(customEffect)
 Header 0.1 1.0
 AppHeader
     property string _for_autopilot
@@ -188,6 +198,11 @@
 MainView 0.1 1.0
 MainViewBase
     property bool automaticOrientation
+    property bool useDeprecatedToolbar
+    default property internal contentsItem
+MainView 1.2
+MainViewBase
+    property internal automaticOrientation
     default property internal contentsItem
 Object 0.1 1.0
 QtObject
@@ -676,6 +691,7 @@
     function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
     function typeString(string)
+    function warningFormat(line, column, message)
 plugins.qmltypes
     name: "FilterBehavior"
     prototype: "QObject"
@@ -693,6 +709,64 @@
     name: "QAbstractProxyModel"
     prototype: "QAbstractItemModel"
     Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    name: "QDeclarativeFeedbackActuator"
+    prototype: "QObject"
+    exports: ["QtFeedback/Actuator 5.0"]
+    name: "Capability"
+    name: "State"
+    Property { name: "actuatorId"; type: "int"; isReadonly: true }
+    Property { name: "name"; type: "string"; isReadonly: true }
+    Property { name: "state"; type: "State"; isReadonly: true }
+    Property { name: "valid"; type: "bool"; isReadonly: true }
+    Property { name: "enabled"; type: "bool" }
+    Method {
+    name: "isCapabilitySupported"
+    Parameter { name: "capability"; type: "Capability" }
+    name: "QDeclarativeFeedbackEffect"
+    prototype: "QObject"
+    exports: ["QtFeedback/Feedback 5.0", "QtFeedback/FeedbackEffect 5.0"]
+    name: "Duration"
+    name: "State"
+    name: "ErrorType"
+    Property { name: "running"; type: "bool" }
+    Property { name: "paused"; type: "bool" }
+    Property { name: "duration"; type: "int" }
+    Property { name: "state"; type: "State" }
+    Property { name: "error"; type: "ErrorType"; isReadonly: true }
+    Method { name: "updateState" }
+    Method { name: "start" }
+    Method { name: "stop" }
+    Method { name: "pause" }
+    name: "QDeclarativeFileEffect"
+    prototype: "QDeclarativeFeedbackEffect"
+    exports: ["QtFeedback/FileEffect 5.0"]
+    Property { name: "loaded"; type: "bool" }
+    Property { name: "source"; type: "QUrl" }
+    Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true }
+    Method { name: "load" }
+    Method { name: "unload" }
+    name: "QDeclarativeHapticsEffect"
+    prototype: "QDeclarativeFeedbackEffect"
+    exports: ["QtFeedback/HapticsEffect 5.0"]
+    Property {
+    name: "availableActuators"
+    Property { name: "intensity"; type: "double" }
+    Property { name: "attackTime"; type: "int" }
+    Property { name: "attackIntensity"; type: "double" }
+    Property { name: "fadeTime"; type: "int" }
+    Property { name: "fadeIntensity"; type: "double" }
+    Property { name: "period"; type: "int" }
+    Property { name: "actuator"; type: "QDeclarativeFeedbackActuator"; isPointer: true }
+    name: "QDeclarativeThemeEffect"
+    prototype: "QObject"
+    exports: ["QtFeedback/EffectPlayer 5.0", "QtFeedback/ThemeEffect 5.0"]
+    name: "Effect"
+    Property { name: "supported"; type: "bool"; isReadonly: true }
+    Property { name: "effect"; type: "Effect" }
+    Method { name: "play" }
+    Method {
+    name: "play"
+    Parameter { name: "effect"; type: "Effect" }
     name: "QSortFilterProxyModel"
     prototype: "QAbstractProxyModel"
     Property { name: "filterRegExp"; type: "QRegExp" }
@@ -725,21 +799,6 @@
     name: "get"
     Parameter { name: "row"; type: "int" }
     Method { name: "count"; type: "int" }
-    name: "ShapeItem"
-    prototype: "QQuickItem"
-    exports: [
-    name: "HAlignment"
-    name: "VAlignment"
-    Property { name: "color"; type: "QColor" }
-    Property { name: "gradientColor"; type: "QColor" }
-    Property { name: "radius"; type: "string" }
-    Property { name: "image"; type: "QVariant" }
-    Property { name: "stretched"; type: "bool" }
-    Property { name: "horizontalAlignment"; type: "HAlignment" }
-    Property { name: "verticalAlignment"; type: "VAlignment" }
-    Property { name: "borderSource"; type: "string" }
-    Signal { name: "borderChanged" }
-    Method { name: "gridUnitChanged" }
     name: "SortBehavior"
     prototype: "QObject"
     exports: ["SortBehavior 1.1"]
@@ -853,22 +912,34 @@
     name: "quitWithError"
     Parameter { name: "errorMessage"; type: "string" }
     Method { name: "quitWithError" }
+    name: "UCDragEvent"
+    prototype: "QObject"
+    exports: ["ListItemDrag 1.2"]
+    name: "Status"
+    Property { name: "status"; type: "Status"; isReadonly: true }
+    Property { name: "from"; type: "int"; isReadonly: true }
+    Property { name: "to"; type: "int"; isReadonly: true }
+    Property { name: "minimumIndex"; type: "int" }
+    Property { name: "maximumIndex"; type: "int" }
+    Property { name: "accept"; type: "bool" }
     name: "UCInverseMouse"
     prototype: "UCMouse"
     exports: ["InverseMouse 0.1", "InverseMouse 1.0"]
     name: "UCListItem"
     prototype: "UCStyledItemBase"
     exports: ["ListItem 1.2"]
-    name: "PanelStatus"
     Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
     Property { name: "divider"; type: "UCListItemDivider"; isReadonly: true; isPointer: true }
     Property { name: "leadingActions"; type: "UCListItemActions"; isPointer: true }
     Property { name: "trailingActions"; type: "UCListItemActions"; isPointer: true }
     Property { name: "highlighted"; type: "bool"; isReadonly: true }
-    Property { name: "swipeOvershoot"; type: "double" }
     Property { name: "contentMoving"; type: "bool"; isReadonly: true }
     Property { name: "color"; type: "QColor" }
     Property { name: "highlightColor"; type: "QColor" }
+    Property { name: "dragging"; type: "bool"; isReadonly: true }
+    Property { name: "dragMode"; type: "bool" }
+    Property { name: "selected"; type: "bool" }
+    Property { name: "selectMode"; type: "bool" }
     Property { name: "action"; type: "UCAction"; isPointer: true }
     Property { name: "listItemData"; type: "QObject"; isList: true; isReadonly: true }
     Property { name: "listItemChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
@@ -884,31 +955,21 @@
     Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
     Property { name: "actions"; type: "UCAction"; isList: true; isReadonly: true }
     Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-    name: "UCListItemAttached"
-    prototype: "QObject"
-    Property { name: "actions"; type: "UCListItemActions"; isReadonly: true; isPointer: true }
-    Property { name: "visibleActions"; type: "UCAction"; isList: true; isReadonly: true }
-    Property { name: "item"; type: "UCListItem"; isReadonly: true; isPointer: true }
-    Property { name: "index"; type: "int"; isReadonly: true }
-    Property { name: "panelStatus"; type: "UCListItem::PanelStatus"; isReadonly: true }
-    Method {
-    name: "snapToPosition"
-    Parameter { name: "position"; type: "double" }
     name: "UCListItemDivider"
-    prototype: "QObject"
-    Property { name: "visible"; type: "bool" }
-    Property { name: "leftMargin"; type: "double" }
-    Property { name: "rightMargin"; type: "double" }
+    prototype: "QQuickItem"
     Property { name: "colorFrom"; type: "QColor" }
     Property { name: "colorTo"; type: "QColor" }
     name: "UCListItemStyle"
     prototype: "QQuickItem"
     exports: ["Ubuntu.Components.Styles/ListItemStyle 1.2"]
-    Property { name: "actionsDelegate"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "selectionDelegate"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "dragHandlerDelegate"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "snapAnimation"; type: "QQuickPropertyAnimation"; isPointer: true }
-    Property { name: "swipeOvershoot"; type: "double" }
+    Property { name: "snapAnimation"; type: "QQuickAbstractAnimation"; isPointer: true }
+    Property { name: "dropAnimation"; type: "QQuickPropertyAnimation"; isPointer: true }
+    Property { name: "animatePanels"; type: "bool"; isReadonly: true }
+    Property { name: "dragPanel"; type: "QQuickItem"; isPointer: true }
+    Method {
+    name: "swipeEvent"
+    Parameter { name: "event"; type: "UCSwipeEvent"; isPointer: true }
+    Method { name: "rebound" }
     name: "UCMouse"
     prototype: "QObject"
     exports: ["Mouse 0.1", "Mouse 1.0"]
@@ -951,6 +1012,10 @@
     name: "exited"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
     Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
+    name: "UCNamespace"
+    prototype: "QObject"
+    exports: ["Ubuntu 1.2"]
+    name: "CaptionsStyle"
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
     exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]
@@ -984,6 +1049,14 @@
     name: "requestFocus"
     Parameter { name: "reason"; type: "Qt::FocusReason" }
     Method { name: "requestFocus"; revision: 1; type: "bool" }
+    name: "UCSwipeEvent"
+    prototype: "QObject"
+    exports: ["SwipeEvent 1.2"]
+    name: "Status"
+    Property { name: "to"; type: "QPointF"; isReadonly: true }
+    Property { name: "from"; type: "QPointF"; isReadonly: true }
+    Property { name: "content"; type: "QPointF" }
+    Property { name: "status"; type: "Status"; isReadonly: true }
     name: "UCUbuntuAnimation"
     prototype: "QObject"
     exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"]
@@ -994,6 +1067,46 @@
     Property { name: "SleepyDuration"; type: "int"; isReadonly: true }
     Property { name: "StandardEasing"; type: "QEasingCurve"; isReadonly: true }
     Property { name: "StandardEasingReverse"; type: "QEasingCurve"; isReadonly: true }
+    name: "UCUbuntuShape"
+    prototype: "QQuickItem"
+    exports: [
+    name: "BackgroundMode"
+    name: "HAlignment"
+    name: "VAlignment"
+    name: "FillMode"
+    name: "WrapMode"
+    Property { name: "radius"; type: "string" }
+    Property { name: "borderSource"; type: "string" }
+    Property { name: "source"; revision: 1; type: "QVariant" }
+    Property { name: "sourceOpacity"; revision: 1; type: "float" }
+    Property { name: "sourceFillMode"; revision: 1; type: "FillMode" }
+    Property { name: "sourceHorizontalWrapMode"; revision: 1; type: "WrapMode" }
+    Property { name: "sourceVerticalWrapMode"; revision: 1; type: "WrapMode" }
+    Property { name: "sourceHorizontalAlignment"; revision: 1; type: "HAlignment" }
+    Property { name: "sourceVerticalAlignment"; revision: 1; type: "VAlignment" }
+    Property { name: "sourceTranslation"; revision: 1; type: "QVector2D" }
+    Property { name: "sourceScale"; revision: 1; type: "QVector2D" }
+    Property { name: "backgroundColor"; revision: 1; type: "QColor" }
+    Property { name: "secondaryBackgroundColor"; revision: 1; type: "QColor" }
+    Property { name: "backgroundMode"; revision: 1; type: "BackgroundMode" }
+    Property { name: "color"; type: "QColor" }
+    Property { name: "gradientColor"; type: "QColor" }
+    Property { name: "image"; type: "QVariant" }
+    Property { name: "stretched"; type: "bool" }
+    Property { name: "horizontalAlignment"; type: "HAlignment" }
+    Property { name: "verticalAlignment"; type: "VAlignment" }
+    Signal { name: "sourceChanged"; revision: 1 }
+    Signal { name: "sourceOpacityChanged"; revision: 1 }
+    Signal { name: "sourceFillModeChanged"; revision: 1 }
+    Signal { name: "sourceHorizontalWrapModeChanged"; revision: 1 }
+    Signal { name: "sourceVerticalWrapModeChanged"; revision: 1 }
+    Signal { name: "sourceHorizontalAlignmentChanged"; revision: 1 }
+    Signal { name: "sourceVerticalAlignmentChanged"; revision: 1 }
+    Signal { name: "sourceTranslationChanged"; revision: 1 }
+    Signal { name: "sourceScaleChanged"; revision: 1 }
+    Signal { name: "backgroundColorChanged"; revision: 1 }
+    Signal { name: "secondaryBackgroundColorChanged"; revision: 1 }
+    Signal { name: "backgroundModeChanged"; revision: 1 }
     name: "UCUnits"
     prototype: "QObject"
     exports: ["UCUnits 0.1", "UCUnits 1.0"]
@@ -1013,6 +1126,12 @@
     name: "UCViewItemsAttached"
     prototype: "QObject"
     exports: ["ViewItems 1.2"]
+    Property { name: "selectMode"; type: "bool" }
+    Property { name: "selectedIndices"; type: "QList<int>" }
+    Property { name: "dragMode"; type: "bool" }
+    Signal {
+    name: "dragUpdated"
+    Parameter { name: "event"; type: "UCDragEvent"; isPointer: true }
     name: "UbuntuI18n"
     prototype: "QObject"
     exports: ["i18n 0.1", "i18n 1.0"]
@@ -1056,6 +1175,21 @@
     name: "tag"
     Parameter { name: "context"; type: "string" }
     Parameter { name: "text"; type: "string" }
+    prototype: "QObject"
+    name: "Haptics"
+    exports: ["Haptics -1.-1"]
+    Property { name: "enabled"; type: "bool"; isReadonly: true }
+    Property { name: "effect"; type: "QDeclarativeHapticsEffect"; isReadonly: true; isPointer: true }
+    Method {
+    name: "play"
+    Parameter { name: "customEffect"; type: "QVariant" }
+    Property { name: "__defaultPropertyFix"; type: "QObject"; isList: true; isReadonly: true }
+    Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
+    prototype: "QObject"
+    name: "Object"
+    exports: ["Object -1.-1"]
+    Property { name: "__defaultPropertyFix"; type: "QObject"; isList: true; isReadonly: true }
+    Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
     name: "ULConditionalLayout"
     prototype: "QObject"
     exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]
@@ -1106,6 +1240,8 @@
     prototype: "QObject"
     exports: ["TestExtras 1.0"]
     Property { name: "touchPresent"; type: "bool"; isReadonly: true }
+    Method { name: "openGLflavor"; type: "string" }
+    Method { name: "cpuArchitecture"; type: "string" }
     Method { name: "touchDevicePresent"; type: "bool" }
     Method { name: "registerTouchDevice" }
     Method {

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-16 14:21:57 +0000
+++ debian/changelog	2015-03-06 08:22:20 +0000
@@ -1,3 +1,77 @@
+ubuntu-ui-toolkit (1.2.1433+15.04.20150206-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Fix infinite icon size grow when asked for a non square icon
+    Fixes: LP: #1422835
+  * IconProvider: Make sure icons fit in the given size
+  [ Christian Dywan ]
+  * Skip select_text_longtap_when_active under opengles2.
+    Fixes: LP: #1401140
+  * Support for multiple devices with push_to_phone.sh.
+  * Take OrientationHelper y coordinate from real parent height.
+    Fixes: LP: #1413194
+  * Update popover position upon pointer movement.
+    Fixes: LP: #1199502, LP: #1415532
+  * Change <code> to be inline-block. Fixes LP: #1427534
+  * Set right anchor on tab overflow buttons. Fixes LP: #1425433
+  * Add tst_listitems_itemselector.qml to EXCEPTIONS. So warnings are 
+    no longer fatal for unit test.
+  [ Sebastien Bacher ]
+  * document that MainView's applicationName is used to set the gettext
+    domain. Fixes: LP: #1421661.
+  [ Tiago Salem Herrmann ]
+  * Drop cache once properties are successfully restored.
+  [ Timo Jyrinki ]
+  * Add dist-upgrade option to the UITK Test Plan script. Output the
+    selected parameters in the beginning.
+  [ Tim Peeters ]
+  * Add MainView 1.2 which removes the deprecated toolbar support.
+  * Enable PageStack header animations for MainView 1.2.
+  * Fix the size and anchors of a Page that is loaded inside a Loader.
+    This is useful when a Page is Loaded by a Tab. Fixes: LP: #1424635
+  * Fix UITK gallery content page width.
+    Fixes: LP: #1424635, LP: #1425470
+  * Set objectName for MainView int est_textinput.header.qml and fix 
+    scenarios in test_textinput.py
+  [ Zsombor Egri ]
+  * Alarm services regression fix. Fixes: LP: #1401883
+  * Implement ListItem dragging support in ListView.
+    Fixes: LP: #119535
+  * Introducing select/multiselect mode in ListItem.
+  * Moving the tst_focus.qml under exceptions till we fix DatePicker
+    binding loops.
+  * RTL (Right To Left) support in ListItem.
+  * RTM branch diff merge. Fixes: LP: #1358610.
+  * Second stage of simplification - divider group property is an item,
+    simplifying the anchoring of the contentItem. PropertyChange does
+    not backup the property binding, uses QQmlPropertyPrivate::write()
+    with parameter to keep bindings. ListItemAnimator uses behavior to
+    animate snapping. Styling got "styledItem" context property to obey
+    general styling rules. clicked() and pressAndHold() emission fix
+    when content is swiped.
+  * Transferring the ListItem attached properties to ListItemStyle API.
+    Most of the style API became redundant, and removed. Few API from
+    ListItem were also removed as not needed. ListItemAnimator,
+    UCListItemAttached and UCActionPanel classes removed.
+    Panel swiping overshoot made elastic. Snapping animation transformed
+    into SmoothedAnimation, uses velocity of 60GU/second. Turning
+    warnings to be reported in the error property.
+    SHOW_SERVICEPROPERTIES_WARNINGS environment variable set will
+    display them in the console. Fixes: LP: #1423203.
+  * Updating documentation and imports for 1.2 & Vivid (Qt 5.4). 
+  * Captions component dedicated to ListItem layouts, a ColumnLayout
+    holding two Layouts pre-configurable for fixed or rest of content 
+    filling behavior.
+  [ Loïc Molinari ]
+  * Refactored UbuntuShape base component.
+    The UbuntuShape needed a rework in order to propose more features 
+    while keeping efficiency high and maintenance easy. 
+    Fixes LP: #1396098, LP: #1396101, LP: #1396104, LP: #1396113, 
+    LP: #1396114, LP: #1396119, LP: #1396124, LP: #1396162, 
+    LP: #1396165, LP: #1396168, LP: #1396178
+
+ -- Zoltán Balogh <[e-mail]>  Tue, 03 Mar 2015 15:20:12 +0200
+
 ubuntu-ui-toolkit (1.1.1403+15.04.20150206-0ubuntu2) vivid; urgency=medium
 
   * No-change rebuild against Qt 5.4.0.
@@ -356,6 +430,34 @@
 
  -- Ubuntu daily release <[e-mail]>  Sun, 02 Nov 2014 13:01:56 +0000
 
+ubuntu-ui-toolkit (1.1.1298+15.04.20150209~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Zsombor Egri ]
+  * isHapticsFeedbackEnabled context property exposed to drive
+    HapticsFeedback in AbstractButton. (LP: #1391877)
+  * Haptics singleton component to provide toolkit wide default and
+    custom feedback functionaity controlled by system settings. (LP:
+    #1391877)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 09 Feb 2015 13:10:45 +0000
+
+ubuntu-ui-toolkit (1.1.1298+15.04.20150202~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Tim Peeters ]
+  * Port "In Progress" translation fix from staging to rtm. (LP:
+    #1391617, #1081607)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 02 Feb 2015 09:11:21 +0000
+
+ubuntu-ui-toolkit (1.1.1298+15.04.20150116~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Florian Boucault ]
+  * ActivityIndicator: make its animation rely solely on the rendering
+    thread so that it does not stop spinning if the main thread is
+    blocked. (LP: #1411376)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 16 Jan 2015 10:17:50 +0000
+
 ubuntu-ui-toolkit (1.1.1298+15.04.20141111.2~rtm-0ubuntu1) 14.09; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2015-01-23 18:11:22 +0000
+++ debian/control	2015-03-06 08:22:20 +0000
@@ -20,10 +20,12 @@
                qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
                qml-module-qttest | qtdeclarative5-test-plugin,
                qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+               qml-module-qtquick-layouts,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
                qml-module-qt-labs-settings | qtdeclarative5-settings-plugin,
+               qml-module-qtqml-models2,
                qtdeclarative5-doc-html,
                qtwebkit5-doc-html,
                qtsvg5-doc-html,
@@ -61,6 +63,7 @@
          libqt5svg5,
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+         qml-module-qtquick-layouts,
          qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,

=== modified file 'documentation/css/base.css'
--- documentation/css/base.css	2012-12-20 08:38:03 +0000
+++ documentation/css/base.css	2015-03-06 08:22:20 +0000
@@ -37,7 +37,7 @@
 	padding: 10px;
 	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
 	background-color: #fdf6f2;
-	display: block;
+	display: inline-block;
 	margin-bottom: 10px;
 		-moz-border-radius: 4px;
 		-webkit-border-radius: 4px;

=== modified file 'documentation/docs.sh'
--- documentation/docs.sh	2014-11-25 16:28:04 +0000
+++ documentation/docs.sh	2015-03-06 08:22:20 +0000
@@ -45,8 +45,6 @@
 qdoc $SRC/ubuntu-ui-toolkit-online-indexes.qdocconf 2> /dev/null
 echo docs: Cross-referenced done.
 
-sed -r -i 's@("main-content">)@\1<ul class="breadcrumb">@g' $1/html/*.html
-sed -r -i 's@(<div class="toc">|<h1 class="title">)@</ul>\1@g' $1/html/*.html
 sed -r -i 's@(</p>)<p/>@\1@g' $1/html/*.html
 sed -r -i 's@(<a class="(next|prev)Page" href=".+">)(.+)(</a>)@<li>\1\3\4</li>@g' $1/html/*.html
 sed -r -i 's@(href="qmlmodule-ubuntu-components0-ubuntu-components-0-1.html">Basic QML Types)@href="overview-ubuntu-sdk.html">Ubuntu User Interface Toolkit@g' $1/html/*.html

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-09-15 12:59:16 +0000
+++ documentation/overview.qdoc	2015-03-06 08:22:20 +0000
@@ -20,6 +20,7 @@
 
      \part General Topics
      \list
+     \li \l{ubuntu-whatsnew.html}{What's new in version 1.2?}
      \li \l{ubuntu-layouts.html}{Layouts} describes a flexible layouting engine
      to ease the development of responsive user interfaces.
      \li \l {Resolution Independence} describes the facilities that should be
@@ -31,11 +32,24 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu
 
-     \part List Items
+     \part List views, list items
+     Components with standardized view items, with conditional actions, multiselect
+     and reordering support on scrollable views. Replaces the Ubuntu.Components.ListItems
+     module components.
+
+     Available through:
+     \code
+         import Ubuntu.Components 1.2
+     \endcode
+     \annotatedlist ubuntu-listitem
+
+     \part List Items module - deprecated
+     This module contains the old set of list items.
+
      Available through:
      \code
          import Ubuntu.Components.ListItems 1.0
@@ -66,7 +80,7 @@
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist theming
 
@@ -75,28 +89,28 @@
      Themes must make sure that these interfaces are all implemented.
      Available through:
      \code
-         import Ubuntu.Components.Styles 1.1
+         import Ubuntu.Components.Styles 1.2
      \endcode
      \annotatedlist style-api
 
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 1.1
+         import Ubuntu.Components 1.2
      \endcode
      \annotatedlist ubuntu-services
 
@@ -113,9 +127,4 @@
          import Ubuntu Test 1.0
      \endcode
      \annotatedlist ubuntu-test
-
-     \part Unstable QML Types
-     The following section lists components which will be part of future releases.
-     Their interface is unstable and thus should not be used in production applications.
-     \annotatedlist unstable-ubuntu-listitems
  */

=== modified file 'documentation/resolution-independence.qdoc'
--- documentation/resolution-independence.qdoc	2014-04-23 08:50:20 +0000
+++ documentation/resolution-independence.qdoc	2015-03-06 08:22:20 +0000
@@ -64,7 +64,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Item {
         width: units.gu(2)
@@ -79,7 +79,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Rectangle {
         height: units.dp(1)
@@ -143,7 +143,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
 
     Label {
         fontSize: "small"

=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
--- documentation/snippets/layouts/SimpleLayout.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/SimpleLayout.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout1.qml'
--- documentation/snippets/layouts/layout1.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout1.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout2.qml'
--- documentation/snippets/layouts/layout2.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout2.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout3.qml'
--- documentation/snippets/layouts/layout3.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout3.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout6.qml'
--- documentation/snippets/layouts/layout6.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout6.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout7.qml'
--- documentation/snippets/layouts/layout7.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/layouts/layout7.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![0]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
--- documentation/snippets/statesaver/ColorChanger.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/ColorChanger.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![color-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![property-group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-23 08:50:20 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  */
 
 //![property-group-saver]
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: root

=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2014-04-23 08:50:20 +0000
+++ documentation/ubuntu-components.qdoc	2015-03-06 08:22:20 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 1.1
+    \qmlmodule Ubuntu.Components 1.2
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-01-27 11:27:37 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-03-06 08:22:20 +0000
@@ -1,5 +1,5 @@
 project = UbuntuUserInterfaceToolkit
-url = http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/
+url = http://developer.ubuntu.com/api/ubuntu-15.04/qml/mobile/
 description = Ubuntu User Interface Toolkit Documentation
 sourcedirs = ./
 sourcedirs += ../modules/Ubuntu/Components
@@ -19,7 +19,7 @@
 excludefiles = $BLD/../modules/Ubuntu/Components/MainView.qml
 outputdir = $BLD/html
 outputformats = HTML
-version = 1.1
+version = 1.2
 syntaxhighlighting = true
 sourceencoding = UTF-8
 outputencoding = UTF-8

=== added file 'documentation/ubuntu-whatsnew.qdoc'
--- documentation/ubuntu-whatsnew.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-whatsnew.qdoc	2015-03-06 08:22:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*!
+ * \page ubuntu-whatsnew.html ubuntu-whatsnew
+ * \title What's new in the version 1.2?
+ *
+ * Beside the pile of bug fixes we have two major changes in the UI Toolkit version 1.2,
+ * as follows:
+ *
+ * \section3 MainView.useDeprecatedToolbar
+ * MainView.useDeprecatedToolbar property \b {got removed} and the new header is always
+ * enabled. If you need to use the old toolbar you can still do that by importing \b
+ * Ubuntu.Components 1.1.
+ *
+ * \section3 A new performant ListItem component
+ * As of 1.2, a new ListItem component and its attached components were added to the toolkit,
+ * which gives more flexibility and performance when used with scrollable views like ListView
+ * or Flickable. Its layout is free, meaning developers can, and have to implement their layout
+ * themselves. The only helper the toolkit provides is the Captions component, which fulfills
+ * the two typical use cases, for the two label column title captioning and for the summary
+ * captions.
+ *
+ * \section3 Ubuntu.Components.ListItems module deprecated
+ * The new ListItem also made the old list items module to be redundant, therefore we marked them
+ * for deprecation. Which means that your application should migrate to the new ListItem as soon as
+ * possible. There are few components which were not marked as deprecated, like ThinDivider, Header,
+ * Expandable and ExpandableColumn were not deprecated.
+ *
+ * \section3 UbuntuShape facelift
+ * There were few properties added and marked to be deprecated as well in UbuntuShape. Some most
+ * wanted features were added, and optimized.
+ */

=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/calculator.qml	2015-03-06 08:22:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator

=== modified file 'examples/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/components/DefaultLayout.qml	2015-03-06 08:22:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'examples/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2014-05-13 15:15:57 +0000
+++ examples/calculator/components/Functions.qml	2015-03-06 08:22:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Layouts 1.0
 
 Grid {

=== modified file 'examples/customtheme/main.qml'
--- examples/customtheme/main.qml	2014-12-04 07:18:58 +0000
+++ examples/customtheme/main.qml	2015-03-06 08:22:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -35,9 +35,6 @@
     */
     //automaticOrientation: true
 
-    // Removes the old toolbar and enables new features of the new header.
-    useDeprecatedToolbar: false
-
     width: units.gu(100)
     height: units.gu(75)
 

=== modified file 'examples/customtheme/theme/Palette.qml'
--- examples/customtheme/theme/Palette.qml	2014-12-04 07:18:58 +0000
+++ examples/customtheme/theme/Palette.qml	2015-03-06 08:22:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Themes.SuruDark 1.1 as Suru
 
 Suru.Palette {

=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2014-04-23 08:50:20 +0000
+++ examples/jokes/jokes.qml	2015-03-06 08:22:20 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import QtMultimedia 5.0
 
 /*!

=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2014-04-23 08:50:20 +0000
+++ examples/locale/locale.qml	2015-03-06 08:22:20 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-07-30 12:59:34 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 Template {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2014-07-02 11:41:18 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "colorsTemplate"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml'
--- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2014-07-02 11:11:53 +0000
+++ examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "crossFadeImagesTemplate"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2014-07-25 12:55:27 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 
 Template {
     objectName: "dialogsTemplate"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-01-05 20:34:54 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-03-06 08:22:20 +0000
@@ -27,4 +27,5 @@
             verticalCenter: parent.verticalCenter
         }
     }
+    onPressAndHold: selectMode = !selectMode
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-07-18 12:12:05 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Toolkit
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {
     objectName: "listItemsTemplate"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-01-05 20:55:12 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-03-06 08:22:20 +0000
@@ -34,21 +34,7 @@
         // clip the action delegates while swiping left/right
         clip: true
 
-        ListItemWithLabel {
-            text: i18n.tr("Basic")
-        }
-        ListItemWithLabel {
-            text: i18n.tr("Colored divider")
-            divider {
-                colorFrom: UbuntuColors.red
-                colorTo: UbuntuColors.green
-            }
-        }
-        ListItemWithLabel {
-            text: i18n.tr("No divider")
-            divider.visible: false
-        }
-        ListItemWithLabel {
+       ListItemWithLabel {
             color: UbuntuColors.blue
             text: i18n.tr("Colored")
         }
@@ -56,7 +42,6 @@
             text: i18n.tr("Highlight color")
             highlightColor: UbuntuColors.orange
             // no highlight without clicked() or leading/trailing actions
-            onClicked: print(i18n.tr("Highlighting list item"))
         }
 
         ListItemActions {
@@ -97,7 +82,6 @@
         }
         ListItemWithLabel {
             text: i18n.tr("Custom action delegates")
-            swipeOvershoot: 0
             leadingActions: ListItemActions {
                 actions: [
                     Action {
@@ -141,4 +125,96 @@
             }
         }
     }
+
+    TemplateSection {
+        className: "ListItem"
+        title: "Select mode"
+
+        ListView {
+            height: units.gu(20)
+            width: parent.width
+            clip: true
+
+            ViewItems.dragMode: ViewItems.selectMode
+            ViewItems.onDragUpdated: {
+                if (event.status == ListItemDrag.Started) {
+                    if (model[event.from] == "Immutable")
+                        event.accept = false;
+                    return;
+                }
+                if (model[event.to] == "Immutable") {
+                    event.accept = false;
+                    return;
+                }
+                // No instantaneous updates
+                if (event.status == ListItemDrag.Moving) {
+                    event.accept = false;
+                    return;
+                }
+                if (event.status == ListItemDrag.Dropped) {
+                    var fromItem = model[event.from];
+                    var list = model;
+                    list.splice(event.from, 1);
+                    list.splice(event.to, 0, fromItem);
+                    model = list;
+                }
+            }
+
+            model: [ i18n.tr("Basic"), i18n.tr("Colored divider"), i18n.tr("Immutable"), i18n.tr("No divider") ]
+            delegate: ListItemWithLabel {
+                text: modelData
+                color: dragging ? "lightblue" : "transparent"
+                divider {
+                    colorFrom: modelData == i18n.tr("Colored divider") ? UbuntuColors.red : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+                    colorTo: modelData == i18n.tr("Colored divider") ? UbuntuColors.green : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+                    visible: modelData != i18n.tr("No divider")
+                }
+            }
+        }
+    }
+
+    TemplateSection {
+        className: "ListItem"
+        title: "Drag mode"
+
+        UbuntuListView {
+            height: units.gu(20)
+            width: parent.width
+            clip: true
+            ViewItems.dragMode: true
+            ViewItems.onDragUpdated: {
+                if (event.status == ListItemDrag.Started) {
+                    if (model.get(event.from).label == "Immutable")
+                        event.accept = false;
+                    return;
+                }
+                if (model.get(event.to).label == "Immutable") {
+                    event.accept = false;
+                    return;
+                }
+                // Live update as you drag
+                if (event.status == ListItemDrag.Moving) {
+                    model.move(event.from, event.to, 1);
+                }
+            }
+
+
+            model: ListModel {
+                ListElement { label: "Basic" }
+                ListElement { label: "Colored divider" }
+                ListElement { label: "Immutable" }
+                ListElement { label: "No divider" }
+            }
+
+            delegate: ListItemWithLabel {
+                text: modelData
+                color: dragMode ? "lightblue" : "lightgray"
+                divider {
+                    colorFrom: modelData == i18n.tr("Colored divider") ? UbuntuColors.red : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+                    colorTo: modelData == i18n.tr("Colored divider") ? UbuntuColors.green : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+                    visible: modelData != i18n.tr("No divider")
+                }
+            }
+        }
+    }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2014-06-17 13:04:52 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "progressBarsTemplate"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Styles.qml	2014-07-21 11:14:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.1
 
 Template {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2014-06-27 06:46:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2014-11-19 11:10:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.2
+import Ubuntu.Components 1.2
 
 Template {
     objectName: "ubuntuShapesTemplate"
@@ -30,18 +30,17 @@
             height: units.gu(8)
 
             UbuntuShape {
-                objectName: "ubuntushape_color_hex"
-                color: UbuntuColors.orange
-            }
-
-            UbuntuShape {
-                objectName: "ubuntushape_color_lightaubergine"
-                color: UbuntuColors.lightAubergine
-            }
-
-            UbuntuShape {
-                objectName: "ubuntushape_color_darkgray"
-                color: UbuntuColors.warmGrey
+                objectName: "ubuntushape_backgroundcolor_orange"
+                backgroundColor: UbuntuColors.orange
+            }
+
+            UbuntuShape {
+                objectName: "ubuntushape_verticalgradient"
+                backgroundColor: UbuntuColors.lightAubergine
+                secondaryBackgroundColor: Qt.rgba(
+                    UbuntuColors.lightAubergine.r, UbuntuColors.lightAubergine.g,
+                    UbuntuColors.lightAubergine.b, 0.25)
+                backgroundMode: UbuntuShape.VerticalGradient
             }
         }
 
@@ -51,12 +50,16 @@
             height: units.gu(8)
 
             UbuntuShape {
-                objectName: "ubuntushape_image"
+                objectName: "ubuntushape_preserveaspectcrop"
+                source: Image { source: "map_icon.png" }
+                sourceFillMode: UbuntuShape.PreserveAspectCrop
+            }
 
-                image: Image {
-                    source: "map_icon.png"
-                    fillMode: Image.PreserveAspectCrop
-                }
+            UbuntuShape {
+                objectName: "ubuntushape_pad"
+                backgroundColor: UbuntuColors.warmGrey
+                source: Image { source: "images.png" }
+                sourceFillMode: UbuntuShape.Pad
             }
         }
 
@@ -68,7 +71,7 @@
             UbuntuShape {
                 objectName: "ubuntushape_radius_small"
 
-                color: Theme.palette.normal.foreground
+                backgroundColor: Theme.palette.normal.foreground
                 radius: "small"
 
                 Label {
@@ -81,7 +84,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_radius_medium"
-                color: Theme.palette.normal.foreground
+                backgroundColor: Theme.palette.normal.foreground
                 radius: "medium"
 
                 Label {
@@ -100,7 +103,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_15_6"
-                color: Theme.palette.normal.foreground
+                backgroundColor: Theme.palette.normal.foreground
                 width: units.gu(15)
                 height: units.gu(6)
                 anchors.verticalCenter: parent.verticalCenter
@@ -108,7 +111,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_10_14"
-                color: Theme.palette.normal.foreground
+                backgroundColor: Theme.palette.normal.foreground
                 width: units.gu(10)
                 height: units.gu(14)
             }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2014-09-20 06:04:39 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 MainView {

=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2014-04-23 08:50:20 +0000
+++ examples/unit-converter/unit-converter.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "conversion.js" as Converter
 
 /*!

=== modified file 'modules/Ubuntu/Components/10/Button.qml'
--- modules/Ubuntu/Components/10/Button.qml	2014-07-29 14:42:56 +0000
+++ modules/Ubuntu/Components/10/Button.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
    \internal

=== modified file 'modules/Ubuntu/Components/10/UbuntuColors10.qml'
--- modules/Ubuntu/Components/10/UbuntuColors10.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/10/UbuntuColors10.qml	2015-03-06 08:22:20 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \internal

=== modified file 'modules/Ubuntu/Components/11/Button.qml'
--- modules/Ubuntu/Components/11/Button.qml	2014-07-28 19:27:17 +0000
+++ modules/Ubuntu/Components/11/Button.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Button

=== added file 'modules/Ubuntu/Components/11/Haptics.qml'
--- modules/Ubuntu/Components/11/Haptics.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/11/Haptics.qml	2015-03-06 08:22:20 +0000
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2014 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+pragma Singleton
+import QtQuick 2.4
+import QtFeedback 5.0
+import Ubuntu.Components 1.2
+
+/*!
+  \qmltype Haptics
+  \inqmlmodule Ubuntu.Components 1.1
+  \ingroup ubuntu-services
+  \brief Singleton defining the haptics feedback used in components, where execution
+  of the feedback is controlled by the system settings.
+
+  Supports global feedback as well as custom feedback. Global feedback can be
+  configured through its properties, and \l play function will play the default
+  configuration, or a custom one if parameter is given.
+
+  Example of using Haptics:
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
+
+  Item {
+      implicitWidth: units.gu(20)
+      implicitHeight: units.gu(5)
+
+      Label {
+          text: "Press me"
+          anchors.fill: parent
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+      }
+      MouseArea {
+          anchors.fill: parent
+          onClicked: Haptics.play()
+      }
+  }
+  \endqml
+
+  Custom effects can be played as follows:
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
+
+  Item {
+      implicitWidth: units.gu(20)
+      implicitHeight: units.gu(5)
+
+      Label {
+          text: "Press me"
+          anchors.fill: parent
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+      }
+      MouseArea {
+          anchors.fill: parent
+          onClicked: Haptics.play({duration: 25, attackIntensity: 0.7})
+      }
+  }
+  \endqml
+
+  \note Though the \l effect property exposes \c start, \c stop and \c pause
+  functions, use those only if you want to have feedback independent on what the
+  system setting is.
+ */
+Object {
+
+    /*!
+      \qmlproperty bool enabled
+      \readonly
+      The property specifies whether the haptics feedback is enabled or not by the system.
+      */
+    readonly property alias enabled: vibra.otherVibrate
+
+    /*!
+      \qmlproperty HapticsEffect effect
+      The property defines the settings of the haptics effect used by the component.
+      The default setting is a haptics effect with a duration of 10 milliseconds
+      with an intensity of 1.0, having fading time of 50 millisecods and fading
+      intensity 0.0, and attack time of 50 milliseconds and with an intensity of
+      0.0.
+      */
+    property alias effect: effect
+
+    /*!
+      \qmlmethod play([customEffect])
+      The function plays the feedback with the configuration specified in \l effect
+      if no parameter is given. Custom effect can be played by specifying the effect
+      properties in a JSON object in \c customEffect.
+
+      The function will exit unconditionaly if playing the effects is blocked by
+      system settings.
+
+      The function will not stop any ongoing haptics effect played, if that one
+      was a default haptics effect. In case of custom effects, the previous effect
+      will be stopped, and settings will be restored before the new haptics will
+      be played. The custom settings properties (the ones which are required to
+      be different from the ones defined in the \l effect) must be specified in
+      the parameter in a JSON object.
+      */
+    function play(customEffect) {
+        if (!vibra.otherVibrate) {
+            return;
+        }
+        if (effectData.data) {
+            // we have a custom effect playing, stop it
+            effect.stop();
+        }
+        if (effect.running) {
+            // this is a global effect, leave
+            return;
+        }
+        if (customEffect) {
+            effectData.backup(customEffect);
+        }
+        effect.start();
+    }
+
+    QtObject {
+        id: effectData
+        property var data
+
+        function backup(customEffect) {
+            data = customEffect;
+            for (var p in data) {
+                var value = data[p];
+                data[p] = effect[p];
+                effect[p] = value;
+            }
+        }
+        function restore() {
+            for (var p in data) {
+                effect[p] = data[p];
+            }
+            data = undefined;
+        }
+    }
+
+    // local feedback component used to play feedback
+    HapticsEffect {
+        id: effect
+        attackIntensity: 0.0
+        attackTime: 50
+        intensity: 1.0
+        duration: 10
+        fadeTime: 50
+        fadeIntensity: 0.0
+
+        onStateChanged: {
+            if (state == HapticsEffect.Stopped) {
+                effectData.restore();
+            }
+        }
+    }
+
+    // watch system settings for otherVibrate
+    ServiceProperties {
+        objectName: "system_effect_settings"
+        id: vibra
+        service: "org.freedesktop.Accounts"
+        serviceInterface: "org.freedesktop.Accounts"
+        path: "/org/freedesktop/Accounts"
+        adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
+        property bool otherVibrate: true
+    }
+}

=== modified file 'modules/Ubuntu/Components/11/UbuntuColors.qml'
--- modules/Ubuntu/Components/11/UbuntuColors.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/11/UbuntuColors.qml	2015-03-06 08:22:20 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype UbuntuColors

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2014-12-03 14:43:27 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtFeedback 5.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract AbstractButton
@@ -83,16 +82,6 @@
 
     activeFocusOnPress: true
 
-    HapticsEffect {
-        id: pressEffect
-        attackIntensity: 0.0
-        attackTime: 50
-        intensity: 1.0
-        duration: 10
-        fadeTime: 50
-        fadeIntensity: 0.0
-    }
-
     MouseArea {
         id: mouseArea
         anchors.fill: parent
@@ -100,9 +89,14 @@
         // as it might occlude the newly assigned mouse area.
         hoverEnabled: true
 
+        // invoke Haptics singleton earlier than we press the button,
+        // so we give some time for the singleton to sync settings with the service
+        property bool hapticsEnabled: Haptics.enabled
+
         onClicked: {
             if (button.__acceptEvents) {
-                pressEffect.start()
+                // FIXME (Vivid) call this in the style rather than from AbstractButton
+                Haptics.play();
                 button.clicked()
             }
         }

=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2014-08-31 19:24:19 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract ActionItem

=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2014-08-31 19:24:19 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ActionList

=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ActivityIndicator

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2015-03-06 08:22:20 +0000
@@ -24,7 +24,7 @@
 
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 StyledItem {
     id: root

=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Components
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Components
 
 /*!
     \internal

=== added file 'modules/Ubuntu/Components/Captions.qml'
--- modules/Ubuntu/Components/Captions.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Captions.qml	2015-03-06 08:22:20 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+
+/*!
+  \qmltype Captions
+  \inqmlmodule Ubuntu.Components 1.2
+  \ingroup ubuntu-listitem
+  \since Ubuntu.Components 1.2
+  \brief Container providing captionStyles for a twin-label column that can be used in
+  RowLayout or GridLayout.
+
+  The labels are placed in a column and can be accessed through \l title and
+  \l subtitle properties. The default spacing between the labels is 0.5 grid units.
+
+  The container only shows the labels which has its text property set to a valid
+  string. The labels not having any text set are not occupying the space. When
+  embedded in a positioner or in a RowLayout, the container is aligned vertically
+  centered. It is recommended to be used in context with RowLayout or GridLayout,
+  however can be used with any component.
+
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
+
+  ListItem {
+      RowLayout {
+           Captions {
+               title.text: "Caption"
+               subtitle.text: "Subtitle text"
+               // attached properties of an Item type property
+               // can be changed only with assignment
+               Component.onCompleted: subtitle.Layout.alignment = Qt.AlignRight
+           }
+           Captions {
+               captionStyle: Ubuntu.SummaryCaptionStyle
+               title.text: "Text"
+               subtitle.text: "Text"
+           }
+      }
+  }
+  \endqml
+
+  Additional items can also be added to the layout after the two labels.
+  \qml
+  Captions {
+      title.text: "Caption"
+      subtitle.text: "Subtitle"
+      Label {
+          text: "third line"
+          fontSize: "xx-small"
+      }
+  }
+  \endqml
+  */
+ColumnLayout {
+    id: captions
+
+    /*!
+      \qmlproperty enumeration captionStyle
+      The property configures the arrangement and font sizes of the Labels in the
+      component. It can take the following values:
+      \list
+        \li \b Ubuntu.TitleCaptionStyle - (default) typical configuration for a left aligned
+            twin-label setup, where the text covers the remaining area on a list
+            layout.
+        \li \b Ubuntu.SummaryCaptionStyle - configuration for a right-aligned twin label setup,
+            with 6 grid units width.
+      \endlist
+      */
+    property int captionStyle: Ubuntu.TitleCaptionStyle
+
+    /*!
+      \qmlproperty Label title
+      \readonly
+      Label occupying the top area of the container.
+      */
+    property alias title: titleLabel
+
+    /*!
+      \qmlproperty Label subtitle
+      \readonly
+      Label occupying the bottom area of the container.
+      */
+    property alias subtitle: subtitleLabel
+
+    clip: true
+    spacing: units.gu(0.5)
+    Layout.fillWidth: (captionStyle == Ubuntu.TitleCaptionStyle)
+    Layout.alignment: Qt.AlignVCenter | ((captionStyle == Ubuntu.SummaryCaptionStyle) ? Qt.AlignRight : Qt.AlignLeft)
+    Layout.minimumWidth: 0
+    Layout.maximumWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? units.gu(6) : parent.width
+    Layout.preferredWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Layout.maximumWidth : 0
+    Layout.minimumHeight: 0
+    Layout.maximumHeight: parent ? parent.height : childrenRect.height
+    Layout.preferredHeight: childrenRect.height
+
+    // handle visibility, do not override visible property!
+    // 'hide' column if title and subtitle is an empty string and
+    // there's no more children added
+    states: State {
+        name: "__q_invisible"
+        when: (title.text === "" && subtitle.text === "") && (captions.children.length == 2)
+        PropertyChanges {
+            target: captions
+            visible: false
+        }
+    }
+
+    Label {
+        id: titleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? "small" : "medium"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+    Label {
+        id: subtitleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: "small"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        maximumLineCount: (captionStyle == Ubuntu.TitleCaptionStyle) ? 2 : 1
+        wrapMode: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.Wrap : Text.NoWrap
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+}

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype CheckBox

=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	2014-08-18 16:02:33 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 
@@ -41,8 +41,8 @@
     \li If the content height is smaller than the value of \l expandedHeight, the combo
         list will be expanded only to the height of the content.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "smaller content"
             Rectangle {
@@ -57,8 +57,8 @@
         GridView or PathView, the content scrolling will be provided by the content
         itself.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "long scrolled content"
             Column {
@@ -76,8 +76,8 @@
     \li In case the content is a single Flickable, ListView, GridView or PathView,
         the content will be filling the entire combo list area defined.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0
         ComboButton {
             text: "listview"
@@ -94,8 +94,8 @@
         If the content wants to take the size of the entire combo list, it should
         bind its height to the \l comboListHeight property.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             id: combo
             text: "smaller content"
@@ -108,8 +108,8 @@
     \li In case the expansion needs to be the size of the combo list content, the \l
         expandedHeight should be set to -1.
         \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         ComboButton {
             text: "auto-sized content"
             expandedHeight: -1
@@ -134,8 +134,8 @@
     example illustrates a possible implementation.
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     ComboButton {
         id: combo
@@ -201,8 +201,8 @@
       \l expandedHeight and \l collapsedHeight values. It is a convenience property
       that can be used to size the combo list content.
       \qml
-      import QtQuick 2.0
-      import Ubuntu.Components 1.1
+      import QtQuick 2.4
+      import Ubuntu.Components 1.2
       import Ubuntu.Components.ListItems 0.1
       ComboButton {
           id: combo

=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qdoc'
--- modules/Ubuntu/Components/CrossFadeImage.qdoc	2014-06-30 12:00:10 +0000
+++ modules/Ubuntu/Components/CrossFadeImage.qdoc	2015-03-06 08:22:20 +0000
@@ -4,8 +4,8 @@
    \brief An Image like component which smoothly fades when its source is updated.
 
    \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         CrossFadeImage {
             width: units.gu(100)

=== modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml'
--- modules/Ubuntu/Components/CrossFadeImage10.qml	2014-07-01 10:56:08 +0000
+++ modules/Ubuntu/Components/CrossFadeImage10.qml	2015-03-06 08:22:20 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
 // we need to use named imports otherwise namespace collision is reported
 // by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components 1.2 as Ubuntu
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml'
--- modules/Ubuntu/Components/CrossFadeImage11.qml	2014-07-02 13:51:07 +0000
+++ modules/Ubuntu/Components/CrossFadeImage11.qml	2015-03-06 08:22:20 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
 // we need to use named imports otherwise namespace collision is reported
 // by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components 1.2 as Ubuntu
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/DraggingArea.qml'
--- modules/Ubuntu/Components/DraggingArea.qml	2013-02-26 10:30:04 +0000
+++ modules/Ubuntu/Components/DraggingArea.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "mathUtils.js" as MathLocal
 
 MouseArea {

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-06-25 11:38:23 +0000
+++ modules/Ubuntu/Components/Header.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Header

=== modified file 'modules/Ubuntu/Components/Icon10.qml'
--- modules/Ubuntu/Components/Icon10.qml	2014-10-20 12:05:33 +0000
+++ modules/Ubuntu/Components/Icon10.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     id: icon

=== modified file 'modules/Ubuntu/Components/Icon11.qml'
--- modules/Ubuntu/Components/Icon11.qml	2014-07-30 20:20:49 +0000
+++ modules/Ubuntu/Components/Icon11.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Icon10 {
     property url source: name ? "image://theme/%1".arg(name) : ""

=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*
   This component is a unified text selection and scrolling handler for both

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-08-07 10:28:01 +0000
+++ modules/Ubuntu/Components/Label.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Label

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Base
@@ -23,6 +23,7 @@
     \ingroup ubuntu-listitems
     \brief Parent class of various list item classes that can have
         an icon and a progression symbol.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples: See subclasses
 */

=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2015-03-06 08:22:20 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Caption
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item that shows a piece of text.
+    \note \b{The component is deprecated. Use ListItem and Captiopns components instead.}
 
     Examples:
     \qml

=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
--- modules/Ubuntu/Components/ListItems/Divider.qml	2014-11-18 11:57:19 +0000
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2015-03-06 08:22:20 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Divider
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Divider to break up list items into groups.
+    \note \b{The component is deprecated.}
 
     Examples: see \l Header
 */

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-03-06 08:22:20 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Empty
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item with no contents.
+    \note \b{The component is deprecated. Use ListItem component instead.}
     The Empty class can be used for generic list items containing other
     components such as buttons. It is selectable and can take mouse clicks.
     It will attempt to detect if a thin dividing line at the bottom of the
@@ -34,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-11-18 11:57:19 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2015-03-06 08:22:20 +0000
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Expandable
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ExpandablesColumn
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {

=== modified file 'modules/Ubuntu/Components/ListItems/Header.qml'
--- modules/Ubuntu/Components/ListItems/Header.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/Header.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Header

=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // internal helper class to create the visuals
 // for the icon.

=== modified file 'modules/Ubuntu/Components/ListItems/ImageWithFallback.qml'
--- modules/Ubuntu/Components/ListItems/ImageWithFallback.qml	2012-11-22 20:59:44 +0000
+++ modules/Ubuntu/Components/ListItems/ImageWithFallback.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Image {
     id: image

=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "." as ListItem
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ItemSelector

=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // internal helper class for text inside the list items.
 Label {

=== modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml'
--- modules/Ubuntu/Components/ListItems/MultiValue.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/MultiValue.qml	2015-03-06 08:22:20 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype MultiValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying multiple values.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml

=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 // Internal helper class for the visuals of
 // the progression symbol.

=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -23,10 +23,11 @@
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item containing a single control
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleControl {

=== modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml'
--- modules/Ubuntu/Components/ListItems/SingleValue.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/SingleValue.qml	2015-03-06 08:22:20 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype SingleValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item displaying a single value
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-12-01 13:19:32 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Standard
@@ -25,12 +25,13 @@
         with a label (text), and optionally an icon, a progression arrow,
         and it can have an embedded Item (\l control) that can be used
         for including Buttons, Switches etc. inside the list item.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     \l {http://design.ubuntu.com/apps/building-blocks/list-items}{See also the Design Guidelines on List Items}.
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {

=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2015-03-06 08:22:20 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype MultiValue
     \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying a second string under the main label.
+    \note \b{The component is deprecated. Use ListItem component instead.}
 
     Examples:
     \qml

=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ThinDivider

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-11-18 11:56:17 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****

=== modified file 'modules/Ubuntu/Components/MainView.qdoc'
--- modules/Ubuntu/Components/MainView.qdoc	2015-01-26 17:05:17 +0000
+++ modules/Ubuntu/Components/MainView.qdoc	2015-03-06 08:22:20 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype MainView
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components 1.2
     \ingroup ubuntu
     \brief MainView is the root Item that should be used for all applications.
         It automatically adds a header and toolbar for its contents and can
@@ -25,8 +25,8 @@
     The simplest way to use a MainView is to include a single \l Page object
     inside the MainView:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(48)
@@ -52,11 +52,11 @@
     For the MainView to automatically rotate its content following the orientation
     of the device, set the \l automaticOrientation property to true.
 
-    If the \l Page inside the MainView includes a Flickable with enough contents for scrolling, the header
-    will automatically hide and show when the user scrolls up or down:
+    If the \l Page inside the MainView includes a Flickable with enough contents for scrolling,
+    the header will automatically hide and show when the user scrolls up or down:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(48)
@@ -85,48 +85,8 @@
     The same header behavior is automatic when using a ListView instead of a Flickable in the above
     example.
 
-    A toolbar can be added to the application by setting the tools property of the \l Page:
-    \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
-
-        MainView {
-            width: units.gu(48)
-            height: units.gu(60)
-
-            Page {
-                title: "Page title"
-                Rectangle {
-                    id: rectangle
-                    anchors.centerIn: parent
-                    width: units.gu(20)
-                    height: units.gu(20)
-                    color: UbuntuColors.coolGrey
-                }
-
-                tools: ToolbarItems {
-                    ToolbarButton {
-                        action: Action {
-                            text: "orange"
-                            onTriggered: rectangle.color = UbuntuColors.orange
-                        }
-                    }
-                    ToolbarButton {
-                        action: Action {
-                            text: "purple"
-                            onTriggered: rectangle.color = UbuntuColors.lightAubergine
-                        }
-                    }
-                }
-            }
-        }
-    \endqml
-    The toolbar is hidden by default, but will be made visible when the user performs a
-    bottom-edge-swipe gesture, and hidden when the user swipes it out, or when the active
-    \l Page inside the MainView is changed.
     The examples above show how to include a single \l Page inside a MainView, but more
     advanced application structures are possible using \l PageStack and \l Tabs.
-    See \l ToolbarItems for details on how to to control the behavior and contents of the toolbar.
 */
 
 
@@ -135,7 +95,8 @@
   The property holds the application's name, which must be the same as the
   desktop file's name.
   The name also sets the name of the QCoreApplication and defaults for data
-  and cache folders that work on the desktop and under confinement.
+  and cache folders that work on the desktop and under confinement, as well as
+  the default gettext domain.
   C++ code that writes files may use QStandardPaths::writableLocation with
   QStandardPaths::DataLocation or QStandardPaths::CacheLocation.
 */
@@ -165,8 +126,8 @@
   For example, in order for the MainView to draw a color gradient beneath
   the content:
   \qml
-      import QtQuick 2.0
-      import Ubuntu.Components 1.1
+      import QtQuick 2.4
+      import Ubuntu.Components 1.2
 
       MainView {
           width: units.gu(40)
@@ -203,13 +164,14 @@
 */
 
 /*!
+  \deprecated
   \qmlproperty bool MainView::useDeprecatedToolbar
   Setting this option will enable the old toolbar, and disable the new features
   that are being added to the new header. Unsetting it removes the toolbar and
   enables developers to have a sneak peek at the new features that are coming to
   the header, even before all the required functionality is implemented.
-  This property will be deprecated after the new header implementation is done and
-  all apps transitioned to using it. Default value: true.
+  Default value up to version 1.1: true.
+  NOT AVAILABLE in version 1.2 where the deprecated toolbar is not supported.
 */
 
 /*!

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-01-26 22:19:11 +0000
+++ modules/Ubuntu/Components/MainView.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
@@ -24,13 +24,11 @@
 MainViewBase {
     id: mainView
 
-    active: true
-
     /*!
       \qmlproperty bool automaticOrientation
      */
     property alias automaticOrientation: canvas.automaticOrientation
-    useDeprecatedToolbar: true
+    property bool useDeprecatedToolbar: true
 
     /*!
       \internal
@@ -125,9 +123,8 @@
           in \l Page to determine the area for the \l Page to fill.
          */
         AppHeader {
-            // FIXME We need to set an object name to this header in order to differentiate it from the ListItem.Header on Autopilot tests.
-            // This is a temporary workaround while we find a better solution for https://bugs.launchpad.net/autopilot/+bug/1210265
-            // --elopio - 2013-08-08
+            // This objectName is used in the MainView autopilot custom proxy object
+            // in order to select the application header.
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height

=== added file 'modules/Ubuntu/Components/MainView12.qml'
--- modules/Ubuntu/Components/MainView12.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/MainView12.qml	2015-03-06 08:22:20 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2012-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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.PerformanceMetrics 1.0
+import QtQuick.Window 2.2
+
+/*! \internal */
+// Documentation is in MainView.qdoc
+MainViewBase {
+    id: mainView
+
+    property alias automaticOrientation: canvas.automaticOrientation
+
+    /*!
+      \internal
+      Use default property to ensure children added do not draw over the header.
+     */
+    default property alias contentsItem: contents.data
+    OrientationHelper {
+        id: canvas
+
+        automaticOrientation: false
+        anchorToKeyboard: mainView.anchorToKeyboard
+
+        // clip the contents so that it does not overlap the header
+        Item {
+            id: contentsClipper
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: headerItem.bottom
+                bottom: parent.bottom
+            }
+            // only clip when necessary
+            // ListView headers may be positioned at the top, independent from
+            // flickable.contentY, so do not clip depending on activePage.flickable.contentY.
+            clip: headerItem.bottomY > 0 && internal.activePage && internal.activePage.flickable
+
+            Item {
+                id: contents
+                anchors {
+                    fill: parent
+                    
+                    // compensate so that the actual y is always 0
+                    topMargin: -parent.y
+                }
+            }
+        }
+
+        /*!
+          The header of the MainView. Can be used to obtain the height of the header
+          in \l Page to determine the area for the \l Page to fill.
+         */
+        AppHeader {
+            // This objectName is used in the MainView autopilot custom proxy object
+            // in order to select the application header.
+            objectName: "MainView_Header"
+            id: headerItem
+            property real bottomY: headerItem.y + headerItem.height
+            animate: true
+            dividerColor: Qt.darker(mainView.headerColor, 1.1)
+            panelColor: Qt.lighter(mainView.headerColor, 1.1)
+
+            title: internal.activePage ? internal.activePage.title : ""
+            flickable: internal.activePage ? internal.activePage.flickable : null
+            pageStack: internal.activePage ? internal.activePage.pageStack : null
+
+            contents: internal.activePage ?
+                          internal.activePage.__customHeaderContents : null
+
+            PageHeadConfiguration {
+                id: defaultConfig
+                // Used when there is no active Page, or a Page 1.0 is used which
+                // does not have a PageHeadConfiguration.
+            }
+            config: internal.activePage && internal.activePage.hasOwnProperty("head") ?
+                        internal.activePage.head : defaultConfig
+
+            // 'window' is defined by QML between startup and showing on the screen.
+            // There is no signal for when it becomes available and re-declaring it is not safe.
+            property bool windowActive: typeof window != 'undefined'
+            onWindowActiveChanged: {
+                window.title = headerItem.title
+            }
+
+            Connections {
+                target: headerItem
+                onTitleChanged: {
+                    if (headerItem.windowActive)
+                        window.title = headerItem.title
+                }
+            }
+
+            // Use of the deprecated toolbar is no longer supported in MainView 1.2.
+            useDeprecatedToolbar: false
+        }
+
+        Connections {
+            target: Qt.application
+            onActiveChanged: {
+                if (Qt.application.active) {
+                    headerItem.animate = false;
+                    headerItem.show();
+                    headerItem.animate = true;
+                }
+            }
+        }
+    }
+
+    Object {
+        id: internal
+
+        // Even when using MainView 1.1, we still support Page 1.0.
+        // PageBase (=Page 1.0) is the superclass of Page 1.1.
+        property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
+
+        function isPage(item) {
+            return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
+                    item.hasOwnProperty("title") && item.hasOwnProperty("tools");
+        }
+    }
+
+    __propagated: QtObject {
+        /*!
+          \internal
+          The header that will be propagated to the children in the page tree node.
+          It is used by Tabs to bind header's tabsModel.
+         */
+        property AppHeader header: headerItem
+
+        /*!
+          \internal
+          The action manager that has the global context for the MainView's actions,
+          and to which a local context can be added for each Page that has actions.actions.
+         */
+        property var actionManager: mainView.actionManager
+
+        /*!
+          \internal
+          Used by PageStack. This property only exists in MainView 1.2 and later.
+         */
+        readonly property bool animateHeader: headerItem.__styleInstance &&
+                                              headerItem.__styleInstance.hasOwnProperty("animateIn") &&
+                                              headerItem.__styleInstance.hasOwnProperty("animateOut") &&
+                                              headerItem.__styleInstance.hasOwnProperty("animateInFinished") &&
+                                              headerItem.__styleInstance.hasOwnProperty("animateOutFinished")
+    }
+}

=== modified file 'modules/Ubuntu/Components/MainViewBase.qml'
--- modules/Ubuntu/Components/MainViewBase.qml	2015-01-27 11:31:24 +0000
+++ modules/Ubuntu/Components/MainViewBase.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
@@ -59,7 +59,6 @@
     }
 
     active: true
-    property bool useDeprecatedToolbar
     property alias actions: unityActionManager.actions
     property alias actionManager: unityActionManager
     Toolkit.ActionManager {

=== modified file 'modules/Ubuntu/Components/Object.qml'
--- modules/Ubuntu/Components/Object.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Object.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Object

=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.1 as Toolkit
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
     \qmltype OptionSelector
@@ -27,7 +27,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         Column {
             spacing: units.gu(3)
 

=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-11-18 12:01:58 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-03-06 08:22:20 +0000
@@ -22,7 +22,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         Column {
             width: 250
             OptionSelector {
@@ -41,9 +41,9 @@
     \endqml
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.1 as Toolkit
+import Ubuntu.Components 1.2 as Toolkit
 
 ListItem.Empty {
     id: option

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-01-09 14:35:43 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype OrientationHelper

=== modified file 'modules/Ubuntu/Components/Page.qdoc'
--- modules/Ubuntu/Components/Page.qdoc	2014-11-28 13:30:05 +0000
+++ modules/Ubuntu/Components/Page.qdoc	2015-03-06 08:22:20 +0000
@@ -28,8 +28,8 @@
     and \l head properties of the page:
 
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(48)
@@ -58,6 +58,12 @@
     \endqml
     See \l MainView for more examples on how to use the header.
     Advanced navigation structures can be created by adding Pages to a \l PageStack or \l Tabs.
+
+    The Page automatically anchors to the left and bottom of its parent. The width of the Page
+    will be the full width of its parent \l MainView or \l PageStack or \l Tab,
+    and the height will adapt to leave space for the header when needed. It is possible to
+    use a Page inside a Loader, but in that case do not set the anchors or size of the Loader
+    so that the Page can control its width and height.
 */
 
 /*!
@@ -86,8 +92,8 @@
     is automatically set to the first child of the page that is Flickable
     and anchors to the top of the page or fills the page. For example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(30)

=== modified file 'modules/Ubuntu/Components/Page10.qml'
--- modules/Ubuntu/Components/Page10.qml	2014-09-25 14:07:07 +0000
+++ modules/Ubuntu/Components/Page10.qml	2015-03-06 08:22:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 Canonical Ltd.
+ * Copyright 2012-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
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
   \internal
@@ -25,10 +25,11 @@
     id: page
     anchors {
         left: parent ? parent.left : undefined
-        right: parent ? parent.right : undefined
         bottom: parent ? parent.bottom : undefined
     }
-    // avoid using parent.height because parent may be a Loader which does not have its height set.
+    // Set width and height so that a parent Loader can be automatically resized
+    // to the size of the loaded Page.
+    width: parentNode ? parentNode.width - page.x : undefined
     height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
 
     isLeaf: true

=== modified file 'modules/Ubuntu/Components/Page11.qml'
--- modules/Ubuntu/Components/Page11.qml	2014-06-30 18:38:15 +0000
+++ modules/Ubuntu/Components/Page11.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*! \internal */
 // Documentation in Page.qdoc
@@ -28,6 +28,10 @@
         id: headerConfig
     }
 
+    onToolsChanged: {
+        print("Page.tools is a deprecated property. Please use Page.head instead.");
+    }
+
     Object {
         id: internal
 

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-01-06 12:36:58 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-03-06 08:22:20 +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
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PageHeadConfiguration
@@ -121,14 +121,13 @@
 
       Example:
       \qml
-        import QtQuick 2.2
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             id: mainView
             width: units.gu(40)
             height: units.gu(50)
-            useDeprecatedToolbar: false
 
             Page {
                 id: page

=== modified file 'modules/Ubuntu/Components/PageHeadSections.qml'
--- modules/Ubuntu/Components/PageHeadSections.qml	2014-07-28 12:15:40 +0000
+++ modules/Ubuntu/Components/PageHeadSections.qml	2015-03-06 08:22:20 +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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype PageHeadSections
@@ -39,15 +39,13 @@
     /*!
       List of strings that represent section names. Example:
       \qml
-        import Ubuntu.Components 1.1
-        import QtQuick 2.2
+        import Ubuntu.Components 1.2
+        import QtQuick 2.4
 
         MainView {
             width: units.gu(50)
             height: units.gu(80)
 
-            useDeprecatedToolbar: false
-
             Page {
                 id: page
                 title: "Sections"

=== modified file 'modules/Ubuntu/Components/PageHeadState.qml'
--- modules/Ubuntu/Components/PageHeadState.qml	2014-09-18 15:31:25 +0000
+++ modules/Ubuntu/Components/PageHeadState.qml	2015-03-06 08:22:20 +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
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1 // for Action
+import QtQuick 2.4
+import Ubuntu.Components 1.2 // for Action
 
 /*!
     \qmltype PageHeadState
@@ -28,14 +28,13 @@
    This example shows how to add an action to the header that
    enables the user to enter search/input mode:
    \qml
-        import QtQuick 2.2
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             id: mainView
             width: units.gu(40)
             height: units.gu(50)
-            useDeprecatedToolbar: false
 
             Page {
                 id: searchPage

=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2015-03-06 08:22:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import "stack.js" as Stack
 
 /*!
@@ -36,8 +36,8 @@
     left/right/top/bottom anchors, explicitly set anchors.fill of the PageStack to
     undefined:
     \qml
-        import QtQuick 2.2
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(40)
@@ -75,8 +75,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
@@ -214,18 +214,8 @@
                                     ? pageStack.__propagated.header.__styleInstance
                                     : null
 
-        function headerCanAnimate() {
-            if (!headStyle) return false;
-            if (!headStyle.hasOwnProperty("animateIn")) return false;
-            if (!headStyle.hasOwnProperty("animateOut")) return false;
-            if (!headStyle.hasOwnProperty("animateInFinished")) return false;
-            if (!headStyle.hasOwnProperty("animateOutFinished")) return false;
-            return true;
-        }
-
-        // FIXME: Replace false by headerCanAnimate() below to enable
-        //  header animations.
-        property bool animateHeader: false
+        property bool animateHeader: pageStack.__propagated.hasOwnProperty("animateHeader") &&
+                                     pageStack.__propagated.animateHeader
 
         // Call this function before pushing or popping to ensure correct order
         // of pushes/pops on the stack. This terminates any currently running

=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \internal
@@ -52,7 +52,8 @@
       The toolbar of the node. Propagates down from the root node.
       This property is DEPRECATED.
      */
-    property Toolbar toolbar: node.__propagated ? node.__propagated.toolbar : null
+    property Toolbar toolbar: node.__propagated && node.__propagated.hasOwnProperty("toolbar")
+                              ? node.__propagated.toolbar : null
 
     /*!
       \internal

=== modified file 'modules/Ubuntu/Components/PageWrapper.qml'
--- modules/Ubuntu/Components/PageWrapper.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/PageWrapper.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "PageWrapperUtils.js" as Utils
 
 /*!

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-07-17 13:58:56 +0000
+++ modules/Ubuntu/Components/Panel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Toolkit
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Toolkit
 
 /*!
     \qmltype Panel
@@ -37,8 +37,8 @@
 
     A black panel that can be swiped in from the lower-right of the window can be created like this:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Item {
             width: units.gu(80)
@@ -68,8 +68,8 @@
 
     A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Item {
             width: units.gu(80)
@@ -105,8 +105,8 @@
     start swiping on the buttons in the examples above in order to hide the panel. To remedy this, clicked()
     signals are forwarded from the panel by calling the child's trigger() function. Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         Rectangle {
             color: Theme.palette.normal.background

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-10-08 09:09:29 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DatePicker
@@ -35,8 +35,8 @@
     only through the \l date property.
 
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -55,8 +55,8 @@
     \b Minutes and \b Seconds strings sepatared with '|' character. A DatePicker
     which shows only year and month date units would look as follows:
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -74,8 +74,8 @@
     is needed, the model should be set to contain the time specific mode flags.
     The following example demonstrates how to use DatePicker for time picking.
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -111,8 +111,8 @@
                 hours picker presenting 24 hours.
     \endlist
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Column {

=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     circular: true

=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Dialer
@@ -34,7 +34,7 @@
     value between 0 and 50.
 
     \qml
-    import QtQuick 2.0
+    import QtQuick 2.4
     import Ubuntu.Components.Pickers 1.0
 
     Dialer {

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DialerHand

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-03-06 08:22:20 +0000
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     circular: (count >= 11)

=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-09-02 05:52:32 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Picker
@@ -34,8 +34,8 @@
 
     Example:
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.Pickers 1.0
 
     Picker {

=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PickerDelegate

=== modified file 'modules/Ubuntu/Components/Pickers/PickerModelBase.qml'
--- modules/Ubuntu/Components/Pickers/PickerModelBase.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerModelBase.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*
   Base model type for DatePicker

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-09-03 08:17:24 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-03-06 08:22:20 +0000
@@ -15,9 +15,9 @@
  */
 
 pragma Singleton
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 
@@ -32,8 +32,8 @@
     area or in a Popover, depending on the form factor, following the design guides
     on date pickers.
     \qml
-    import QtQuick 2.0
-    import Ubuntu.Components 1.1
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
 
     MainWindow {
         width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-05-07 10:42:31 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Row {
     id: row

=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 PickerModelBase {
     // local properties

=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-11-21 19:15:17 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 /*!

=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
@@ -32,7 +32,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype DefaultSheet
@@ -33,7 +33,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.1
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-01-14 13:32:44 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-11-25 15:39:38 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype Popover
@@ -31,8 +31,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
         import Ubuntu.Components.Popups 1.0
 
@@ -289,4 +289,12 @@
     onHeightChanged: internal.updatePosition()
     /*! \internal */
     onRotatingChanged: hide()
+
+    Connections {
+        target: pointerTarget
+        onXChanged: internal.updatePosition()
+        onYChanged: internal.updatePosition()
+        onWidthChanged: internal.updatePosition()
+        onHeightChanged: internal.updatePosition()
+    }
 }

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2015-01-29 15:46:10 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PopupBase

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2014-11-18 11:59:47 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype SheetBase

=== modified file 'modules/Ubuntu/Components/ProgressBar10.qml'
--- modules/Ubuntu/Components/ProgressBar10.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/ProgressBar10.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ProgressBar

=== modified file 'modules/Ubuntu/Components/ProgressBar11.qml'
--- modules/Ubuntu/Components/ProgressBar11.qml	2014-06-23 12:52:52 +0000
+++ modules/Ubuntu/Components/ProgressBar11.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 ProgressBar {
     property bool showProgressPercentage: true

=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
--- modules/Ubuntu/Components/PullToRefresh.qml	2014-06-27 06:18:48 +0000
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype PullToRefresh
@@ -32,9 +32,9 @@
     component by defining the completion clause to the \l refreshing property.
 
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -82,9 +82,9 @@
     to be shown by the component. Custom implementations can hold any component,
     which will be anchor filled to the component itself.
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -130,9 +130,9 @@
     \note When declared as child of Flickable, set parent to the flickable explicitly
     so the component does not land in the \c content of Flickable.
     \qml
-    import QtQuick 2.2
+    import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.1
+    import Ubuntu.Components 1.2
     import Ubuntu.Components.ListItems 1.0
 
     MainView {

=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ScrollBar

=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/Slider.qml	2015-03-06 08:22:20 +0000
@@ -16,7 +16,7 @@
 
 // FIXME(loicm) Add support for keyboard shortcuts (basically left/right).
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "mathUtils.js" as MathUtils
 
 /*!

=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2014-08-25 05:56:28 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmlabstract StyledItem

=== modified file 'modules/Ubuntu/Components/Styles/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Styles/ComboButtonStyle.qml	2014-10-21 17:48:12 +0000
+++ modules/Ubuntu/Components/Styles/ComboButtonStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype ComboButtonStyle

=== modified file 'modules/Ubuntu/Components/Styles/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2014-11-04 10:55:58 +0000
+++ modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2015-03-06 08:22:20 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype PageHeadStyle

=== modified file 'modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml'
--- modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2014-10-21 17:48:12 +0000
+++ modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 /*!
     \qmltype PullToRefreshStyle

=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Switch.qml	2015-03-06 08:22:20 +0000
@@ -17,7 +17,7 @@
 // FIXME(loicm) It would be nice to have a draggable thumb to toggle the switch,
 //     that needs to be validated with designers though.
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Switch

=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2014-11-18 12:02:55 +0000
+++ modules/Ubuntu/Components/Tab.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Tab
@@ -43,10 +43,63 @@
     property url iconSource
 
     /*!
-      The contents of the page. Use a \l Page or a Loader that loads an external \l Page.
+      The contents of the Tab. Use a \l Page or a Loader that instantiates a Component or
+      loads an external \l Page.
+      When using a Loader, do not set the anchors or dimensions of the Loader so that the
+      \l Page can control the height and prevent overlapping the header.
+      Example:
+      \qml
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
+        MainView {
+            width: units.gu(40)
+            height: units.gu(50)
+
+            Component {
+                id: pageComponent
+                Page {
+                    Label {
+                        anchors.centerIn: parent
+                        text: "Loaded when tab is selected."
+                    }
+                }
+            }
+            Tabs {
+                id: tabs
+                Tab {
+                    title: i18n.tr("Simple page")
+                    page: Page {
+                        Label {
+                            anchors.centerIn: parent
+                            text: i18n.tr("Always loaded")
+                        }
+                    }
+                }
+                Tab {
+                    id: loaderTab
+                    title: i18n.tr("Page loader")
+                    page: Loader {
+                        // no anchors
+                        id: loader
+                        sourceComponent: tabs.selectedTab == loaderTab ? pageComponent : null
+                        onStatusChanged: if (loader.status == Loader.Ready) console.log('Loaded')
+                    }
+                }
+            }
+        }
+      \endqml
      */
     property Item page: null
 
+    // In case the page is a Loader with a Page inside, the Loader needs to be
+    // anchored to the bottom of the Tab. Width and height are set by the Page.
+    Binding {
+        target: page
+        property: "anchors.bottom"
+        value: tab.bottom
+        when: page
+    }
+
     /*!
       \qmlproperty int index
       \readonly

=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-08-21 05:24:14 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype TabBar

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-11-18 11:38:59 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*!
     \qmltype Tabs
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
@@ -103,8 +103,8 @@
     \l PageStack, and pushing other pages on top of that, as is shown in the following example:
 
     \qml
-        import QtQuick 2.0
-        import Ubuntu.Components 1.1
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
 
         MainView {
             id: mainView

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2014-11-26 09:57:47 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 Ubuntu.StyledItem {

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-12-03 15:46:20 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1 as Ubuntu
+import QtQuick 2.4
+import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 /*!
@@ -526,8 +526,8 @@
       between 11 and 31 into the text input:
 
       \qml
-      import QtQuick 2.0
-      import Ubuntu.Components 1.1
+      import QtQuick 2.4
+      import Ubuntu.Components 1.2
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Popover {
@@ -68,6 +68,11 @@
         popover.visible = false;
     }
 
+    /*
+      Force positioning so that the popover is positioned in the screen while
+      the input is on the top of the screen
+    */
+    y: parent ? (parent.height - height) / 2 : 0
     autoClose: false
     contentHeight: row.childrenRect.height
     contentWidth: row.childrenRect.width

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-07-08 10:59:01 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Image {
     id: container
@@ -28,12 +28,7 @@
     verticalAlignment: Image.AlignVCenter
     source: "artwork/spinner.png"
 
-    /*
-      Changed from RotationAnimator to RotationAnimation to 
-      work around bug: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1338602
-      "Activity Indicator crashes in QML/Widget mixed applications"
-    */
-    RotationAnimation on rotation {
+    RotationAnimator on rotation {
         running: styledItem.running
         from: 0
         to: 360

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-11-03 19:41:08 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: bubbleShape

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2015-03-06 08:22:20 +0000
@@ -16,8 +16,8 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: buttonForeground

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2015-03-06 08:22:20 +0000
@@ -16,8 +16,8 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: buttonStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-11-07 15:45:22 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: checkBoxStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-29 06:27:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1 as Style
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Styles 1.2 as Style
 
 Style.ComboButtonStyle {
     id: comboStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     // style API

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import QtGraphicalEffects 1.0
 
 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-07-25 12:55:27 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2015-03-06 08:22:20 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: dialogForegroundStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2014-10-24 15:56:22 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2015-03-06 08:22:20 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.2
+import QtQuick 2.4
 
 Item {
     id: dividerStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-25 05:28:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-03-06 08:22:20 +0000
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: headerStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml	2013-12-04 10:49:19 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml	2015-03-06 08:22:20 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 ShaderEffect {
     id: magnifier

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-08-26 14:12:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2015-03-06 08:22:20 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: ambianceStyle

=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2015-01-13 14:41:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-/*
- * Copyright 2014 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
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 1.2
-
-/*
-  This component is the holder of the ListItem actions.
-  */
-Item {
-
-    // styling properties
-    /*
-      Color of the background.
-      */
-    // FIXME: use Palette colors instead when available
-    property color backgroundColor: (leading ? UbuntuColors.red : "white")
-
-    /*
-      Color used in coloring the icons.
-      */
-    // FIXME: use Palette colors instead when available
-    property color foregroundColor: leading ? "white" : UbuntuColors.darkGrey
-
-    /*
-      Specifies the width of the component visualizing the action.
-      */
-    property real paintedActionWidth: units.gu(2.5)
-
-    // panel implementation
-    id: panel
-    width: Math.max(
-               actionsRow.childrenRect.width,
-               ListItem.visibleActions.length * MathUtils.clamp(paintedActionWidth, height, actionsRow.maxItemWidth))
-
-    // used for module/autopilot testing
-    objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
-
-    /*
-      Specifies whether the panel is used to visualize leading or trailing actions.
-      */
-    readonly property bool leading: ListItem.panelStatus == ListItem.Leading
-    readonly property real swipedOffset: leading ? width + x : ListItem.item.width - x;
-    readonly property bool swiping: ListItem.item.highlighted && ListItem.item.contentMoving
-
-    anchors {
-        left: leading ? undefined : ListItem.item.contentItem.right
-        right: leading ? ListItem.item.contentItem.left : undefined
-        top: ListItem.item.contentItem.top
-        bottom: ListItem.item.contentItem.bottom
-    }
-
-    Rectangle {
-        objectName: "panel_background"
-        anchors {
-            fill: parent
-            // add 4 times the overshoot margins to cover the background when tugged
-            leftMargin: (leading && panel.ListItem.item) ? -units.gu(4 * panel.ListItem.item.swipeOvershoot) : 0
-            rightMargin: (!leading && panel.ListItem.item) ? -units.gu(4 * panel.ListItem.item.swipeOvershoot) : 0
-        }
-        color: panel.backgroundColor
-    }
-
-    // handle action triggering
-    Connections {
-        target: panel.ListItem.item
-        onContentMovementEnded: {
-            if (actionsRow.selectedAction) {
-                actionsRow.selectedAction.trigger(actionsRow.listItemIndex);
-                actionsRow.listItemIndex = -1;
-                actionsRow.selectedAction = null;
-            }
-        }
-    }
-
-    // track drag direction, so we know in which direction we should snap
-    property real prevX: 0.0
-    property real snapChangerLimit: 0.0
-    property real threshold: units.gu(1)
-    property bool snapIn: false
-    onXChanged: {
-        if (prevX < x && (snapChangerLimit <= x)) {
-            snapIn = leading;
-            snapChangerLimit = x - threshold;
-        } else if (prevX > x && (x < snapChangerLimit)) {
-            snapIn = !leading;
-            snapChangerLimit = x + threshold;
-        }
-        prevX = x;
-    }
-    // default snapping!
-    onSwipingChanged: {
-        if (swiping) {
-            // the dragging got started, set prevX
-            prevX = panel.x;
-            return;
-        }
-        if (!visible) {
-            return;
-        }
-        // snap in if the offset is bigger than the overshoot and the direction of the drag is to reveal the panel
-        var snapPos = (swipedOffset > units.gu(2) && snapIn) ? panel.width : 0.0;
-        ListItem.snapToPosition(snapPos);
-    }
-
-    Row {
-        id: actionsRow
-        anchors {
-            left: parent.left
-            top: parent.top
-            bottom: parent.bottom
-            leftMargin: spacing
-        }
-
-        property real maxItemWidth: panel.ListItem.item.width / panel.ListItem.visibleActions.length
-
-        property Action selectedAction
-        property int listItemIndex: -1
-
-        Repeater {
-            model: panel.ListItem.visibleActions
-            AbstractButton {
-                id: actionButton
-                action: modelData
-                enabled: action.enabled
-                opacity: action.enabled ? 1.0 : 0.5
-                width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, actionsRow.maxItemWidth)
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                }
-                function trigger() {
-                    actionsRow.selectedAction = modelData;
-                    actionsRow.listItemIndex = panel.ListItem.index;
-                    panel.ListItem.snapToPosition(0.0);
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: Theme.palette.selected.background
-                    visible: pressed
-                }
-
-                Loader {
-                    id: delegateLoader
-                    height: parent.height
-                    sourceComponent: panel.ListItem.actions.delegate ? panel.ListItem.actions.delegate : defaultDelegate
-                    property Action action: modelData
-                    property int index: index
-                    property bool pressed: actionButton.pressed
-                    onItemChanged: {
-                        // use action's objectName to identify the visualized action
-                        if (item && item.objectName === "") {
-                            item.objectName = modelData.objectName;
-                            actionButton.objectName = "actionbutton_" + modelData.objectName
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: defaultDelegate
-        Item {
-            width: height
-            Icon {
-                width: panel.paintedActionWidth
-                height: width
-                name: action.iconName
-                color: panel.foregroundColor
-                anchors.centerIn: parent
-            }
-        }
-    }
-}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-01-12 15:44:59 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-03-06 08:22:20 +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
@@ -14,22 +14,400 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components.Styles 1.2 as Styles
 import Ubuntu.Components 1.2
 
 Styles.ListItemStyle {
 
-    swipeOvershoot: units.gu(2)
-    actionsDelegate: ListItemPanel{}
-
-    snapAnimation: PropertyAnimation {
+    id: listItemStyle
+    /*
+     * Take over the ListItem's index context property as repeater used in panel
+     * overrides the property.
+     */
+    readonly property int listItemIndex: index
+
+    // anchoring
+    anchors {
+        top: parent ? parent.top : undefined
+        bottom: parent ? parent.bottom : undefined
+        bottomMargin: styledItem.divider.visible ? styledItem.divider.height : 0
+        left: styledItem.contentItem.left
+        leftMargin: -styledItem.contentItem.anchors.leftMargin
+        right: styledItem.contentItem.right
+        rightMargin: -styledItem.contentItem.anchors.rightMargin
+    }
+    LayoutMirroring.childrenInherit: true
+
+    // leading/trailing panels
+    Component {
+        id: panelComponent
+        Rectangle {
+            id: panel
+            objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
+            readonly property real panelWidth: actionsRow.width
+
+            // FIXME use theme palette colors once stabilized
+            color: leading ? UbuntuColors.red : "white"
+            anchors.fill: parent
+            width: parent ? parent.width : 0
+
+            readonly property ListItemActions itemActions: leading ? styledItem.leadingActions : styledItem.trailingActions
+
+            Row {
+                id: actionsRow
+                anchors {
+                    left: leading ? undefined : parent.left
+                    right: leading ? parent.right : undefined
+                    top: parent.top
+                    bottom: parent.bottom
+                    leftMargin: spacing
+                }
+
+                readonly property real maxItemWidth: parent.width / itemActions.actions.length
+
+                Repeater {
+                    model: itemActions.actions
+                    AbstractButton {
+                        id: actionButton
+                        action: modelData
+                        enabled: action.enabled
+                        opacity: action.enabled ? 1.0 : 0.5
+                        width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, actionsRow.maxItemWidth)
+                        anchors {
+                            top: parent ? parent.top : undefined
+                            bottom: parent ? parent.bottom : undefined
+                        }
+                        function trigger() {
+                            internals.selectedAction = modelData;
+                            listItemStyle.rebound();
+                        }
+
+                        Rectangle {
+                            anchors.fill: parent
+                            color: Theme.palette.selected.background
+                            visible: pressed
+                        }
+
+                        Loader {
+                            id: delegateLoader
+                            height: parent.height
+                            sourceComponent: itemActions.delegate ? itemActions.delegate : defaultDelegate
+                            property Action action: modelData
+                            property int index: index
+                            property bool pressed: actionButton.pressed
+                            onItemChanged: {
+                                // use action's objectName to identify the visualized action
+                                if (item && item.objectName === "") {
+                                    item.objectName = modelData.objectName;
+                                    actionButton.objectName = "actionbutton_" + modelData.objectName
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Component {
+                id: defaultDelegate
+                Item {
+                    width: height
+                    Icon {
+                        width: units.gu(2.5)
+                        height: width
+                        name: action.iconName
+                        // FIXME use theme palette colors once stabilized
+                        color: leading ? "white" : UbuntuColors.darkGrey
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+    }
+    // the selection/multiselection panel
+    Component {
+        id: selectionDelegate
+        Item {
+            id: selectPanel
+            objectName: "selection_panel" + listItemIndex
+            anchors.fill: parent ? parent : undefined
+
+            CheckBox {
+                id: checkbox
+                opacity: 0
+                // for unit and autopilot tests
+                objectName: "listitem_select"
+                anchors.centerIn: parent
+                // for the initial value
+                checked: styledItem.selected
+                onCheckedChanged: styledItem.selected = checked;
+            }
+
+            states: State {
+                name: "enabled"
+                when: loaded && styledItem.selectMode
+                PropertyChanges {
+                    target: checkbox
+                    opacity: 1.0
+                }
+            }
+            transitions: Transition {
+                from: ""
+                to: "*"
+                reversible: true
+                enabled: listItemStyle.animatePanels
+                OpacityAnimator {
+                    easing: UbuntuAnimation.StandardEasing
+                    duration: UbuntuAnimation.FastDuration
+                }
+            }
+        }
+    }
+    // drag panel
+    Component {
+        id: dragDelegate
+        Item {
+            id: dragPanel
+            objectName: "drag_panel" + index
+            anchors.fill: parent ? parent : undefined
+            Icon {
+                objectName: "icon"
+                id: dragIcon
+                anchors.centerIn: parent
+                width: units.gu(3)
+                height: width
+                name: "view-grid-symbolic"
+                opacity: 0.0
+                scale: 0.5
+            }
+            Binding {
+                target: listItemStyle
+                property: "dragPanel"
+                value: dragPanel
+            }
+
+            states: State {
+                name: "enabled"
+                when: loaded && styledItem.dragMode
+                PropertyChanges {
+                    target: dragIcon
+                    opacity: 1.0
+                    scale: 1.0
+                }
+            }
+            transitions: Transition {
+                from: ""
+                to: "*"
+                reversible: true
+                enabled: listItemStyle.animatePanels
+                ParallelAnimation {
+                    OpacityAnimator {
+                        easing: UbuntuAnimation.StandardEasing
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                    ScaleAnimator {
+                        easing: UbuntuAnimation.StandardEasing
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+            }
+        }
+    }
+
+    // leading panel loader
+    Loader {
+        id: leadingLoader
+        objectName: "leading_loader"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.left
+        }
+        width: parent.width
+        sourceComponent: internals.swiped && styledItem.leadingActions && styledItem.leadingActions.actions.length > 0 ?
+                             panelComponent : null
+        // context properties used in delegates
+        readonly property bool leading: true
+        readonly property bool loaded: status == Loader.Ready
+
+        // panel states
+        states: [
+            State {
+                name: "selectable"
+                when: styledItem.selectMode
+                PropertyChanges {
+                    target: leadingLoader
+                    sourceComponent: selectionDelegate
+                    width: units.gu(5)
+                }
+                PropertyChanges {
+                    target: listItemStyle
+                    anchors.leftMargin: 0
+                }
+                PropertyChanges {
+                    target: styledItem.contentItem
+                    anchors.leftMargin: units.gu(5)
+                }
+            }
+        ]
+        transitions: Transition {
+            from: ""
+            to: "selectable"
+            reversible: true
+            enabled: listItemStyle.animatePanels
+            PropertyAnimation {
+                target: styledItem.contentItem
+                properties: "anchors.leftMargin"
+                easing: UbuntuAnimation.StandardEasing
+                duration: UbuntuAnimation.FastDuration
+            }
+        }
+    }
+    // trailing panel loader
+    Loader {
+        id: trailingLoader
+        objectName: "trailing_loader"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.right
+        }
+        width: parent.width
+        sourceComponent: internals.swiped && styledItem.trailingActions && styledItem.trailingActions.actions.length > 0 ?
+                             panelComponent : null
+        // context properties used in delegates
+        readonly property bool leading: false
+        readonly property bool loaded: status == Loader.Ready
+
+        // panel states
+        states: State {
+            name: "draggable"
+            when: styledItem.dragMode
+            PropertyChanges {
+                target: trailingLoader
+                sourceComponent: dragDelegate
+                width: units.gu(5)
+            }
+            PropertyChanges {
+                target: listItemStyle
+                anchors.rightMargin: 0
+            }
+            PropertyChanges {
+                target: styledItem.contentItem
+                anchors.rightMargin: units.gu(5)
+            }
+        }
+        transitions: Transition {
+            from: ""
+            to: "*"
+            reversible: true
+            enabled: listItemStyle.animatePanels
+            PropertyAnimation {
+                target: styledItem.contentItem
+                properties: "anchors.rightMargin"
+                easing: UbuntuAnimation.StandardEasing
+                duration: UbuntuAnimation.FastDuration
+            }
+        }
+    }
+
+    // internals
+    QtObject {
+        id: internals
+        // action triggered
+        property Action selectedAction
+        // swipe handling
+        readonly property bool swiped: listItemStyle.x != styledItem.x && !styledItem.selectMode && !styledItem.dragMode
+        readonly property Item swipedPanel: leadingPanel ? leadingLoader.item : trailingLoader.item
+        readonly property bool leadingPanel: listItemStyle.LayoutMirroring.enabled ? (listItemStyle.x < 0) : (listItemStyle.x > 0)
+        readonly property real swipedOffset: (leadingPanel ? listItemStyle.x : -listItemStyle.x) *
+                                             (listItemStyle.LayoutMirroring.enabled ? -1 : 1)
+        readonly property real panelWidth: swipedPanel && swipedPanel.hasOwnProperty("panelWidth") ? swipedPanel.panelWidth : 0
+        property real prevX: 0.0
+        property real snapChangerLimit: 0.0
+        readonly property real threshold: units.gu(1.5)
+        property bool snapIn: false
+
+        // update snap direction
+        function updateSnapDirection() {
+            if (prevX < listItemStyle.x && (snapChangerLimit <= listItemStyle.x)) {
+                snapIn = (listItemStyle.LayoutMirroring.enabled !== leadingPanel);
+                snapChangerLimit = listItemStyle.x - threshold;
+            } else if (prevX > listItemStyle.x && (listItemStyle.x < snapChangerLimit)) {
+                snapIn = (listItemStyle.LayoutMirroring.enabled === leadingPanel);
+                snapChangerLimit = listItemStyle.x + threshold;
+            }
+            prevX = listItemStyle.x;
+        }
+        // perform snapIn/Out
+        function snap() {
+            var snapPos = (swipedOffset > units.gu(2) && snapIn) ? panelWidth : 0.0;
+            snapPos *= leadingPanel ? 1 : -1;
+            // invert snapPos on RTL
+            snapPos *= listItemStyle.LayoutMirroring.enabled ? -1 : 1;
+            snapAnimation.snapTo(snapPos);
+        }
+        // handle elasticity on overshoot
+        function overshoot(event) {
+            var offset = event.content.x - styledItem.contentItem.anchors.leftMargin;
+            offset *= leadingPanel ? 1 : -1;
+            // invert offset on RTL
+            offset *= listItemStyle.LayoutMirroring.enabled ? -1 : 1;
+            if (offset > panelWidth) {
+                // do elastic move
+                event.content.x = styledItem.contentItem.x + (event.to.x - event.from.x) / 2;
+            }
+        }
+    }
+    snapAnimation: SmoothedAnimation {
+        objectName: "snap_animation"
+        target: styledItem.contentItem
         property: "x"
-        easing {
-            type: Easing.OutElastic
-            period: 0.5
-        }
-        duration: UbuntuAnimation.BriskDuration
-    }
-
+        // use 50GU/second velocity
+        velocity: units.gu(60)
+        onStopped: {
+            // trigger action
+            if (to == styledItem.contentItem.anchors.leftMargin && internals.selectedAction) {
+                internals.selectedAction.trigger(listItemIndex);
+                internals.selectedAction = null;
+            }
+        }
+        // animated snapping
+        function snapTo(pos) {
+            if (pos == to && styledItem.contentItem.x == to) {
+                return;
+            }
+
+            stop();
+            from = styledItem.contentItem.x;
+            if (!pos) {
+                pos = styledItem.contentItem.anchors.leftMargin;
+            }
+            to = pos;
+            start();
+        }
+    }
+
+    // simple drop animation
+    dropAnimation: SmoothedAnimation {
+        properties: "y"
+        velocity: units.gu(60)
+    }
+
+    onXChanged: internals.updateSnapDirection()
+    // overriding default functions
+    function swipeEvent(event) {
+        if (event.status == SwipeEvent.Started) {
+            internals.prevX = x;
+            snapAnimation.stop();
+        } else if (event.status == SwipeEvent.Finished) {
+            internals.snap();
+        } else if (event.status == SwipeEvent.Updated) {
+            // handle elasticity when overshooting
+            internals.overshoot(event)
+        }
+    }
+    function rebound() {
+        snapAnimation.snapTo(0);
+    }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-12-04 07:18:58 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2015-03-06 08:22:20 +0000
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     // styling properties