Merge lp:~zsombi/ubuntu-ui-toolkit/separate-uitk-versions into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Separate 1.2 from 1.3 versions in all Ubuntu.Component modules.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1528
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1735/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/465/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/462/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2618/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1735/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1529
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1736/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/464/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2622/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1736/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

dh_install: qtdeclarative5-ubuntu-ui-toolkit-plugin missing files (usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/artwork), aborting

You moved modules/Ubuntu/Components/ListItems/artwork/[e-mail] move to Comoponents/ but didn't update .install - by accident?

Remember, you can use "bzr bd" to spot this more quickly as you won't have to wait for J to finish if it's just packaging changes.

review: Needs Fixing

[Cris Dywan (kalikiana)]

examples/1.2/ubuntu-ui-toolkit-gallery/po/es.po

Do we really have to duplicate translations? It should be fine to share strings and translators will appreciate not having to go through an exponential increase in strings.

[Zsombor Egri (zsombi)]

> dh_install: qtdeclarative5-ubuntu-ui-toolkit-plugin missing files
> (usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/artwork), aborting
>
> You moved modules/Ubuntu/Components/ListItems/artwork/[e-mail]
> move to Comoponents/ but didn't update .install - by accident?
>
> Remember, you can use "bzr bd" to spot this more quickly as you won't have to
> wait for J to finish if it's just packaging changes.

I wish I could, I tried, it fails building even on a perfect branch :/

[Zsombor Egri (zsombi)]

> examples/1.2/ubuntu-ui-toolkit-gallery/po/es.po
>
> Do we really have to duplicate translations? It should be fine to share
> strings and translators will appreciate not having to go through an
> exponential increase in strings.

I have chosen the easiest way no, we can shape it if we want to later. We can share, of course, but we may also have to add more stuff to the newer releases, so why do share?

Also, the gallery needs to be redesigned from the grounds, so we use Layouts, etc. And that is better to do in a separate branch too.

[Cris Dywan (kalikiana)]

> > examples/1.2/ubuntu-ui-toolkit-gallery/po/es.po
> >
> > Do we really have to duplicate translations? It should be fine to share
> > strings and translators will appreciate not having to go through an
> > exponential increase in strings.
>
> I have chosen the easiest way no, we can shape it if we want to later. We can
> share, of course, but we may also have to add more stuff to the newer
> releases, so why do share?

That really depends on what we do with it. Will we maintain additions to each copy and run all AP tests against multiple versions for compatibility testing? How many varianrts will we have? Which one will app developers read when looking for example code?

In that sense, multiplying the amount of translatable strings is not my only concern, but the most obvious problem.

> Also, the gallery needs to be redesigned from the grounds, so we use Layouts,
> etc. And that is better to do in a separate branch too.

For that matter, I don't see why the gallery has to be duplicated in this step. We've had good arguments to do that before the version revamp and didn't do it. Again my main concern is doing this by the way with no clear plan.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1530
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1738/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2627
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/468
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/468/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/465
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2625
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2625/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20192

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1738/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1531
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1740/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2633
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/470
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/470/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/467
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2631
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2631/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20201

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1740/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1742/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2640
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/472
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/472/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/469
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2638
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2638/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20216

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1742/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

The on-going outages in CI make me uneasy… other than that the branch looks good and I didn't spot any genuine failures.

review: Approve

[Zoltan Balogh (bzoltan)]

> The on-going outages in CI make me uneasy… other than that the branch looks
> good and I didn't spot any genuine failures.

Well :) The bz push is always at our disposal... but it would be nice to see a clean merge executed by Jenkins.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/926/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/234
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/233
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/233/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/233

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1743/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2642
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/473
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/473/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2640
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2640/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20219

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1743/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1744/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2643/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/472
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/474
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/474/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/471
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2285/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2641
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2641/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20221

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1744/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1745/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2659
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/473
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/475
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/475/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/472
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2657
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20256

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1745/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1747/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2674
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/475
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/477
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/477/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2672
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2672/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20278

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1747/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-04-29 05:08:32 +0000
+++ components.api	2015-05-06 10:32:32 +0000
@@ -1,3 +1,47 @@
+Button 0.1 1.0
+AbstractButton
+    property color color
+    property Gradient gradient
+    property font font
+    property string iconPosition
+UbuntuColors 0.1 1.0
+QtObject
+    readonly property color orange
+    readonly property color lightAubergine
+    readonly property color midAubergine
+    readonly property color darkAubergine
+    readonly property color warmGrey
+    readonly property color coolGrey
+    property Gradient orangeGradient
+    property Gradient greyGradient
+Button 1.1
+AbstractButton
+    property color strokeColor
+    property color color
+    property Gradient gradient
+    property font font
+    property string iconPosition
+Haptics 0.1 1.0
+Object
+    readonly property bool enabled
+    property HapticsEffect effect
+    function play(customEffect)
+UbuntuColors 1.1
+QtObject
+    readonly property color orange
+    readonly property color lightAubergine
+    readonly property color midAubergine
+    readonly property color darkAubergine
+    readonly property color warmGrey
+    readonly property color coolGrey
+    property Gradient orangeGradient
+    property Gradient greyGradient
+    readonly property color lightGrey
+    readonly property color darkGrey
+    readonly property color red
+    readonly property color green
+    readonly property color blue
+    readonly property color purple
 AbstractButton 0.1 1.0
 ActionItem
     signal clicked()
@@ -21,19 +65,6 @@
 ActivityIndicator 0.1 1.0
 AnimatedItem
     property bool running
-Button 0.1 1.0
-AbstractButton
-    property color color
-    property Gradient gradient
-    property font font
-    property string iconPosition
-Button 1.1
-AbstractButton
-    property color strokeColor
-    property color color
-    property Gradient gradient
-    property font font
-    property string iconPosition
 Captions 1.2
 ColumnLayout
     property int captionStyle
@@ -43,7 +74,7 @@
 AbstractButton
     property bool checked
 ComboButton 1.1
-Button
+Toolkit.Button
     property bool expanded
     property real collapsedHeight
     property real expandedHeight
@@ -67,11 +98,6 @@
     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
@@ -86,115 +112,6 @@
 Label 0.1 1.0
 Text
     property string fontSize
-Base 0.1 1.0
-Empty
-    property variant icon
-    property url fallbackIconSource
-    property string fallbackIconName
-    property bool progression
-    property bool iconFrame
-    property real __iconWidth
-    property real __iconHeight
-    property real __leftIconMargin
-    property real __rightIconMargin
-    property bool __iconIsItem
-    default property internal children
-Caption 0.1 1.0
-Item
-    property string text
-Divider 0.1 1.0
-Image
-Empty 0.1 1.0
-AbstractButton
-    property bool selected
-    property bool highlightWhenPressed
-    property bool removable
-    property bool confirmRemoval
-    readonly property string swipingState
-    readonly property bool waitingConfirmationForRemoval
-    signal itemRemoved
-    property int __height
-    property bool showDivider
-    default property internal children
-    property internal __contents
-    property list<Item> backgroundIndicator
-    property ThinDivider divider
-    property real __contentsMargins
-    function cancelItemRemoval()
-Expandable 0.1 1.0
-Empty
-    property bool expanded
-    property real collapsedHeight
-    property real expandedHeight
-    property bool collapseOnClick
-    default property QtObject children
-ExpandablesColumn 0.1 1.0
-Flickable
-    readonly property Item expandedItem
-    function expandItem(item)
-    function collapse()
-    default property QtObject children
-Header 0.1 1.0
-Item
-    property string text
-    property internal __foregroundColor
-ItemSelector 0.1 1.0
-ListItem.Empty
-    property var model
-    property bool expanded
-    property bool multiSelection
-    property bool colourImage
-    property Component delegate
-    property real containerHeight
-    property int selectedIndex
-    property bool currentlyExpanded
-    readonly property real itemHeight
-    signal delegateClicked(int index)
-    signal expansionCompleted()
-MultiValue 0.1 1.0
-Base
-    property variant values
-SingleControl 0.1 1.0
-Empty
-    property Item control
-    function __updateControl()
-SingleValue 0.1 1.0
-Base
-    property string value
-Standard 0.1 1.0
-Empty
-    property variant icon
-    property url fallbackIconSource
-    property string fallbackIconName
-    property bool progression
-    property real __iconWidth
-    property real __iconHeight
-    property real __leftIconMargin
-    property real __rightIconMargin
-    property Item control
-    property bool iconFrame
-    property bool __controlAreaPressed
-    property bool __iconIsItem
-    property internal __foregroundColor
-Subtitled 0.1 1.0
-Base
-    property string subText
-ThinDivider 0.1 1.0
-Rectangle
-    property bool __lightBackground
-ValueSelector 0.1 1.0
-Empty
-    property variant icon
-    property url fallbackIconSource
-    property string fallbackIconName
-    property real __iconWidth
-    property real __iconHeight
-    property real __leftIconMargin
-    property real __rightIconMargin
-    property bool iconFrame
-    property variant values
-    property int selectedIndex
-    property bool expanded
 MainView 0.1 1.0
 MainViewBase
     property bool automaticOrientation
@@ -248,11 +165,6 @@
 Page 1.1
 Page10
     readonly property PageHeadConfiguration head
-Page 1.3
-PageTreeNode
-    property string title
-    property Flickable flickable
-    readonly property PageHeadConfiguration head
 PageHeadConfiguration 1.1
 Object
     property list<Action> actions
@@ -261,10 +173,6 @@
     property string preset
     readonly property PageHeadSections sections
     property color foregroundColor
-PageHeadConfiguration 1.3
-Toolkit12.PageHeadConfiguration
-    property bool locked
-    property bool visible
 PageHeadSections 1.1
 QtObject
     property bool enabled
@@ -302,6 +210,770 @@
     property bool __closeOnContentsClicks
     property bool __openOnHover
     property bool pressed
+ProgressBar 0.1 1.0
+AnimatedItem
+    property bool indeterminate
+    property real minimumValue
+    property real maximumValue
+    property real value
+ProgressBar 1.1
+ProgressBar
+    property bool showProgressPercentage
+PullToRefresh 1.1
+StyledItem
+    readonly property bool releaseToRefresh
+    readonly property real offset
+    property Component content
+    property Flickable target
+    property bool refreshing
+    signal refresh()
+Scrollbar 0.1 1.0
+StyledItem
+    property Flickable flickableItem
+    property int align
+    property bool __interactive
+    property internal __private
+Slider 0.1 1.0
+StyledItem
+    property real minimumValue
+    property real maximumValue
+    property real value
+    property bool live
+    property bool pressed
+    signal touched(bool onThumb)
+    function formatValue(v)
+    property internal __internals
+Switch 0.1 1.0
+CheckBox
+Tab 0.1 1.0
+PageTreeNode
+    property string title
+    property url iconSource
+    property Item page
+    readonly property int index
+    property internal __protected
+TabBar 0.1 1.0
+StyledItem
+    property Item tabsItem
+    property var model
+    readonly property bool pressed
+    property bool selectionMode
+    property int selectedIndex
+    property bool alwaysSelectionMode
+    property bool animate
+Tabs 0.1 1.0
+PageTreeNode
+    property int selectedTabIndex
+    readonly property Tab selectedTab
+    readonly property Item currentPage
+    property TabBar tabBar
+    default property list<Item> tabChildren
+    readonly property int count
+    signal modelChanged()
+    property var __model
+TextArea 0.1 1.0
+Ubuntu.StyledItem
+    property bool highlighted
+    property string placeholderText
+    readonly property string displayText
+    property bool selectByMouse
+    property bool autoExpand
+    property bool autoSize
+    property int maximumLineCount
+    property real contentWidth
+    property real contentHeight
+    property var popover
+    property bool activeFocusOnPress
+    property url baseUrl
+    property bool canPaste
+    property bool canRedo
+    property bool canUndo
+    property color color
+    property Component cursorDelegate
+    property int cursorPosition
+    property rectangle cursorRectangle
+    property bool cursorVisible
+    property enumeration effectiveHorizontalAlignment
+    property font font
+    property enumeration horizontalAlignment
+    property bool inputMethodComposing
+    property enumeration inputMethodHints
+    property int length
+    property int lineCount
+    property enumeration mouseSelectionMode
+    property enumeration persistentSelection
+    property bool readOnly
+    property enumeration renderType
+    property string selectedText
+    property color selectedTextColor
+    property color selectionColor
+    property int selectionEnd
+    property int selectionStart
+    property string text
+    property enumeration textFormat
+    property enumeration verticalAlignment
+    property enumeration wrapMode
+    signal linkActivated(string link)
+    function copy()
+    function cut()
+    function deselect()
+    function insert(position, text)
+    function positionAt(x, y)
+    function isRightToLeft(start, end)
+    function moveCursorSelection(position, mode)
+    function paste(data)
+    function positionToRectangle(position)
+    function redo()
+    function select(start, end)
+    function selectAll()
+    function selectWord()
+    function getFormattedText(start, end)
+    function getText(start, end)
+    function remove(start, end)
+    function undo()
+TextField 0.1 1.0
+ActionItem
+    property bool highlighted
+    property string placeholderText
+    property bool hasClearButton
+    property Component customSoftwareInputPanel
+    property var popover
+    property list<Object> primaryItem
+    property list<Object> secondaryItem
+    property bool errorHighlight
+    property bool acceptableInput
+    property bool activeFocusOnPress
+    property bool autoScroll
+    property bool canPaste
+    property bool canRedo
+    property bool canUndo
+    property color color
+    property real contentHeight
+    property real contentWidth
+    property Component cursorDelegate
+    property int cursorPosition
+    property rectangle cursorRectangle
+    property bool cursorVisible
+    property string displayText
+    property enumeration echoMode
+    property font font
+    property string inputMask
+    property bool inputMethodComposing
+    property enumeration inputMethodHints
+    property int length
+    property int maximumLength
+    property enumeration mouseSelectionMode
+    property bool persistentSelection
+    property bool readOnly
+    property enumeration renderType
+    property bool selectByMouse
+    readonly property string selectedText
+    property int selectionStart
+    property int selectionEnd
+    property string text
+    property Validator validator
+    property enumeration horizontalAlignment
+    property enumeration effectiveHorizontalAlignment
+    property enumeration verticalAlignment
+    property string passwordCharacter
+    property color selectionColor
+    property color selectedTextColor
+    signal accepted()
+    function copy()
+    function cut()
+    function paste(data)
+    function deselect()
+    function insert(position, text)
+    function positionAt(x, position)
+    function positionToRectangle(pos)
+    function select(start, end)
+    function selectAll()
+    function selectWord()
+    function isRightToLeft(start, end)
+    function moveCursorSelection(position, mode)
+    function redo()
+    function undo()
+    function remove(start, end)
+    function getText(start, end)
+ToolbarButton 0.1 1.0
+ActionItem
+ToolbarItems 0.1 1.0
+Item
+    default property list<Object> contents
+    property Item back
+    property Item pageStack
+    property bool opened
+    property bool locked
+UbuntuListView 0.1 1.0
+ListView
+    property int expandedIndex
+UbuntuListView 1.1
+UbuntuListView
+    property PullToRefresh pullToRefresh
+UbuntuNumberAnimation 0.1 1.0
+NumberAnimation
+AbstractButton 1.3
+ActionItem
+    signal clicked()
+    signal pressAndHold()
+    property bool pressed
+    property bool hovered
+    property bool __acceptEvents
+    property internal __mouseArea
+ActionItem 1.3
+StyledItem
+    property Action action
+    property string text
+    property url iconSource
+    property string iconName
+    signal triggered(var value)
+    function trigger(value)
+ActionList 1.3
+QtObject
+    default property list<Action> children
+    property list<Action> actions
+ActivityIndicator 1.3
+AnimatedItem
+    property bool running
+Button 1.3
+AbstractButton
+    property color strokeColor
+    property color color
+    property Gradient gradient
+    property font font
+    property string iconPosition
+Captions 1.3
+ColumnLayout
+    property int captionStyle
+    property Label title
+    property Label subtitle
+CheckBox 1.3
+AbstractButton
+    property bool checked
+ComboButton 1.3
+Button
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    readonly property real comboListHeight
+    default property list<Item> comboList
+    property color dropdownColor
+CrossFadeImage 1.3
+Item
+    property url source
+    property int fillMode
+    property int fadeDuration
+    property size sourceSize
+    property string fadeStyle
+    readonly property bool running
+    readonly property int status
+Header 1.3
+AppHeader
+    property string _for_autopilot
+Label 1.3
+Text
+    property string fontSize
+MainView 1.3
+MainViewBase
+    property internal automaticOrientation
+    default property internal contentsItem
+OptionSelector 1.3
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property Component delegate
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+OptionSelectorDelegate 1.3
+ListItem.Empty
+    property string subText
+    property url icon
+    property bool constrainImage
+    property bool colourImage
+    property color assetColour
+    readonly property ListView listView
+    readonly property string fragColourShader
+OrientationHelper 1.3
+Item
+    property bool automaticOrientation
+    property bool transitionEnabled
+    readonly property bool rotating
+    property int __orientationAngle
+    property int orientationAngle
+    property bool anchorToKeyboard
+Page 1.3
+PageTreeNode
+    property string title
+    property Flickable flickable
+    readonly property PageHeadConfiguration head
+PageHeadConfiguration 1.3
+Object
+    property list<Action> actions
+    property Action backAction
+    property Item contents
+    property string preset
+    readonly property PageHeadSections sections
+    property color foregroundColor
+    property bool locked
+    property bool visible
+PageHeadSections 1.3
+QtObject
+    property bool enabled
+    property var model
+    property int selectedIndex
+PageHeadState 1.3
+State
+    property PageHeadConfiguration head
+    property list<Action> actions
+    property Action backAction
+    property Item contents
+PageStack 1.3
+PageTreeNode
+    property bool __showHeader
+    property int depth
+    property Item currentPage
+    function push(page, properties)
+    function pop()
+    function clear()
+    default property list<Object> data
+Panel 1.3
+Item
+    default property list<Object> contents
+    property int align
+    property bool opened
+    function open()
+    function close()
+    property int hideTimeout
+    property bool locked
+    property real hintSize
+    property real triggerSize
+    readonly property real position
+    property bool animate
+    readonly property bool animating
+    property bool __closeOnContentsClicks
+    property bool __openOnHover
+    property bool pressed
+ProgressBar 1.3
+AnimatedItem
+    property bool indeterminate
+    property real minimumValue
+    property real maximumValue
+    property real value
+    property bool showProgressPercentage
+PullToRefresh 1.3
+StyledItem
+    readonly property bool releaseToRefresh
+    readonly property real offset
+    property Component content
+    property Flickable target
+    property bool refreshing
+    signal refresh()
+Scrollbar 1.3
+Toolkit.StyledItem
+    property Flickable flickableItem
+    property int align
+    property bool __interactive
+    property internal __private
+Slider 1.3
+Toolkit.StyledItem
+    property real minimumValue
+    property real maximumValue
+    property real value
+    property bool live
+    property bool pressed
+    signal touched(bool onThumb)
+    function formatValue(v)
+    property internal __internals
+Switch 1.3
+CheckBox
+Tab 1.3
+PageTreeNode
+    property string title
+    property url iconSource
+    property Item page
+    readonly property int index
+    property internal __protected
+TabBar 1.3
+Toolkit.StyledItem
+    property Item tabsItem
+    property var model
+    readonly property bool pressed
+    property bool selectionMode
+    property int selectedIndex
+    property bool alwaysSelectionMode
+    property bool animate
+Tabs 1.3
+PageTreeNode
+    property int selectedTabIndex
+    readonly property Tab selectedTab
+    readonly property Item currentPage
+    property TabBar tabBar
+    default property list<Item> tabChildren
+    readonly property int count
+    signal modelChanged()
+    property var __model
+TextArea 1.3
+Ubuntu.StyledItem
+    property bool highlighted
+    property string placeholderText
+    readonly property string displayText
+    property bool selectByMouse
+    property bool autoExpand
+    property bool autoSize
+    property int maximumLineCount
+    property real contentWidth
+    property real contentHeight
+    property var popover
+    property bool activeFocusOnPress
+    property url baseUrl
+    property bool canPaste
+    property bool canRedo
+    property bool canUndo
+    property color color
+    property Component cursorDelegate
+    property int cursorPosition
+    property rectangle cursorRectangle
+    property bool cursorVisible
+    property enumeration effectiveHorizontalAlignment
+    property font font
+    property enumeration horizontalAlignment
+    property bool inputMethodComposing
+    property enumeration inputMethodHints
+    property int length
+    property int lineCount
+    property enumeration mouseSelectionMode
+    property enumeration persistentSelection
+    property bool readOnly
+    property enumeration renderType
+    property string selectedText
+    property color selectedTextColor
+    property color selectionColor
+    property int selectionEnd
+    property int selectionStart
+    property string text
+    property enumeration textFormat
+    property enumeration verticalAlignment
+    property enumeration wrapMode
+    signal linkActivated(string link)
+    function copy()
+    function cut()
+    function deselect()
+    function insert(position, text)
+    function positionAt(x, y)
+    function isRightToLeft(start, end)
+    function moveCursorSelection(position, mode)
+    function paste(data)
+    function positionToRectangle(position)
+    function redo()
+    function select(start, end)
+    function selectAll()
+    function selectWord()
+    function getFormattedText(start, end)
+    function getText(start, end)
+    function remove(start, end)
+    function undo()
+TextField 1.3
+ActionItem
+    property bool highlighted
+    property string placeholderText
+    property bool hasClearButton
+    property Component customSoftwareInputPanel
+    property var popover
+    property list<Object> primaryItem
+    property list<Object> secondaryItem
+    property bool errorHighlight
+    property bool acceptableInput
+    property bool activeFocusOnPress
+    property bool autoScroll
+    property bool canPaste
+    property bool canRedo
+    property bool canUndo
+    property color color
+    property real contentHeight
+    property real contentWidth
+    property Component cursorDelegate
+    property int cursorPosition
+    property rectangle cursorRectangle
+    property bool cursorVisible
+    property string displayText
+    property enumeration echoMode
+    property font font
+    property string inputMask
+    property bool inputMethodComposing
+    property enumeration inputMethodHints
+    property int length
+    property int maximumLength
+    property enumeration mouseSelectionMode
+    property bool persistentSelection
+    property bool readOnly
+    property enumeration renderType
+    property bool selectByMouse
+    readonly property string selectedText
+    property int selectionStart
+    property int selectionEnd
+    property string text
+    property Validator validator
+    property enumeration horizontalAlignment
+    property enumeration effectiveHorizontalAlignment
+    property enumeration verticalAlignment
+    property string passwordCharacter
+    property color selectionColor
+    property color selectedTextColor
+    signal accepted()
+    function copy()
+    function cut()
+    function paste(data)
+    function deselect()
+    function insert(position, text)
+    function positionAt(x, position)
+    function positionToRectangle(pos)
+    function select(start, end)
+    function selectAll()
+    function selectWord()
+    function isRightToLeft(start, end)
+    function moveCursorSelection(position, mode)
+    function redo()
+    function undo()
+    function remove(start, end)
+    function getText(start, end)
+ToolbarButton 1.3
+ActionItem
+ToolbarItems 1.3
+Item
+    default property list<Object> contents
+    property Item back
+    property Item pageStack
+    property bool opened
+    property bool locked
+UbuntuListView 1.3
+UbuntuListView
+    property PullToRefresh pullToRefresh
+UbuntuNumberAnimation 1.3
+NumberAnimation
+Base 0.1 1.0
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property bool progression
+    property bool iconFrame
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property bool __iconIsItem
+    default property internal children
+Caption 0.1 1.0
+Item
+    property string text
+Divider 0.1 1.0
+Image
+Empty 0.1 1.0
+AbstractButton
+    property bool selected
+    property bool highlightWhenPressed
+    property bool removable
+    property bool confirmRemoval
+    readonly property string swipingState
+    readonly property bool waitingConfirmationForRemoval
+    signal itemRemoved
+    property int __height
+    property bool showDivider
+    default property internal children
+    property internal __contents
+    property list<Item> backgroundIndicator
+    property ThinDivider divider
+    property real __contentsMargins
+    function cancelItemRemoval()
+Expandable 0.1 1.0
+Empty
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    property bool collapseOnClick
+    default property QtObject children
+ExpandablesColumn 0.1 1.0
+Flickable
+    readonly property Item expandedItem
+    function expandItem(item)
+    function collapse()
+    default property QtObject children
+Header 0.1 1.0
+Item
+    property string text
+    property internal __foregroundColor
+ItemSelector 0.1 1.0
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property Component delegate
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+MultiValue 0.1 1.0
+Base
+    property variant values
+SingleControl 0.1 1.0
+Empty
+    property Item control
+    function __updateControl()
+SingleValue 0.1 1.0
+Base
+    property string value
+Standard 0.1 1.0
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property bool progression
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property Item control
+    property bool iconFrame
+    property bool __controlAreaPressed
+    property bool __iconIsItem
+    property internal __foregroundColor
+Subtitled 0.1 1.0
+Base
+    property string subText
+ThinDivider 0.1 1.0
+Rectangle
+    property bool __lightBackground
+ValueSelector 0.1 1.0
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property bool iconFrame
+    property variant values
+    property int selectedIndex
+    property bool expanded
+Base 1.3
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property bool progression
+    property bool iconFrame
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property bool __iconIsItem
+    default property internal children
+Caption 1.3
+Item
+    property string text
+Divider 1.3
+Image
+Empty 1.3
+AbstractButton
+    property bool selected
+    property bool highlightWhenPressed
+    property bool removable
+    property bool confirmRemoval
+    readonly property string swipingState
+    readonly property bool waitingConfirmationForRemoval
+    signal itemRemoved
+    property int __height
+    property bool showDivider
+    default property internal children
+    property internal __contents
+    property list<Item> backgroundIndicator
+    property ThinDivider divider
+    property real __contentsMargins
+    function cancelItemRemoval()
+Expandable 1.3
+Empty
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    property bool collapseOnClick
+    default property QtObject children
+ExpandablesColumn 1.3
+Flickable
+    readonly property Item expandedItem
+    function expandItem(item)
+    function collapse()
+    default property QtObject children
+Header 1.3
+Item
+    property string text
+    property internal __foregroundColor
+ItemSelector 1.3
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property Component delegate
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+MultiValue 1.3
+Base
+    property variant values
+SingleControl 1.3
+Empty
+    property Item control
+    function __updateControl()
+SingleValue 1.3
+Base
+    property string value
+Standard 1.3
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property bool progression
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property Item control
+    property bool iconFrame
+    property bool __controlAreaPressed
+    property bool __iconIsItem
+    property internal __foregroundColor
+Subtitled 1.3
+Base
+    property string subText
+ThinDivider 1.3
+Rectangle
+    property bool __lightBackground
+ValueSelector 1.3
+Empty
+    property variant icon
+    property url fallbackIconSource
+    property string fallbackIconName
+    property real __iconWidth
+    property real __iconHeight
+    property real __leftIconMargin
+    property real __rightIconMargin
+    property bool iconFrame
+    property variant values
+    property int selectedIndex
+    property bool expanded
 DatePicker 0.1 1.0
 StyledItem
     property string mode
@@ -351,6 +1023,55 @@
 PickerPanel 0.1 1.0
 Object
     function openDatePicker(caller, property, mode)
+DatePicker 1.3
+StyledItem
+    property string mode
+    property date date
+    property date minimum
+    property date maximum
+    readonly property int year
+    readonly property int month
+    readonly property int day
+    readonly property int week
+    readonly property int hours
+    readonly property int minutes
+    readonly property int seconds
+    property var locale
+    readonly property bool moving
+Dialer 1.3
+StyledItem
+    property real minimumValue
+    property real maximumValue
+    property real size
+    property real handSpace
+    readonly property Item centerItem
+    property list<var> centerContent
+    readonly property list<DialerHands> hands
+    signal handUpdated(var hand)
+DialerHand 1.3
+StyledItem
+    property real value
+    property DialerHandGroup hand
+    readonly property Dialer dialer
+    default property list<QtObject> overlay
+    readonly property int index
+    property internal __grabber
+Picker 1.3
+StyledItem
+    property bool circular
+    property var model
+    property Component delegate
+    property int selectedIndex
+    property bool live
+    readonly property bool moving
+    function positionViewAtIndex(index)
+    property int __clickedIndex
+PickerDelegate 1.3
+AbstractButton
+    readonly property Picker picker
+PickerPanel 1.3
+Object
+    function openDatePicker(caller, property, mode)
 ActionSelectionPopover 0.1 1.0
 Popover
     property Item target
@@ -411,39 +1132,66 @@
     property bool modal
     property internal __leftButton
     property internal __rightButton
-ProgressBar 0.1 1.0
-AnimatedItem
-    property bool indeterminate
-    property real minimumValue
-    property real maximumValue
-    property real value
-ProgressBar 1.1
-ProgressBar
-    property bool showProgressPercentage
-PullToRefresh 1.1
-StyledItem
-    readonly property bool releaseToRefresh
-    readonly property real offset
-    property Component content
-    property Flickable target
-    property bool refreshing
-    signal refresh()
-Scrollbar 0.1 1.0
-Toolkit.StyledItem
-    property Flickable flickableItem
-    property int align
-    property bool __interactive
-    property internal __private
-Slider 0.1 1.0
-Toolkit.StyledItem
-    property real minimumValue
-    property real maximumValue
-    property real value
-    property bool live
-    property bool pressed
-    signal touched(bool onThumb)
-    function formatValue(v)
-    property internal __internals
+ActionSelectionPopover 1.3
+Popover
+    property Item target
+    property var actions
+    property Component delegate
+ComposerSheet 1.3
+SheetBase
+    signal cancelClicked
+    signal confirmClicked
+DefaultSheet 1.3
+SheetBase
+    property bool doneButton
+    signal closeClicked
+    signal doneClicked
+Dialog 1.3
+PopupBase
+    default property list<Object> contents
+    property string title
+    property string text
+    property Item caller
+    property Item pointerTarget
+    property real edgeMargins
+    property real callerMargin
+    property bool modal
+Popover 1.3
+PopupBase
+    default property list<Object> container
+    property real contentWidth
+    property real contentHeight
+    property Item caller
+    property Item pointerTarget
+    property real edgeMargins
+    property real callerMargin
+    property bool autoClose
+    property Component foregroundStyle
+    function show()
+    function hide()
+    function __makeInvisible()
+PopupBase 1.3
+OrientationHelper
+    property Item dismissArea
+    property bool grabDismissAreaEvents
+    property PropertyAnimation fadingAnimation
+    function show()
+    function hide()
+    function __closeIfHidden()
+    function __closePopup()
+    property Item __foreground
+    property bool __closeOnDismissAreaPress
+    property internal __dimBackground
+    property internal __eventGrabber
+SheetBase 1.3
+PopupBase
+    default property list<Object> container
+    property real contentsWidth
+    property real contentsHeight
+    property string title
+    property bool modal
+    property internal __leftButton
+    property internal __rightButton
 ComboButtonStyle 1.1
 Item
     property real dropDownWidth
@@ -470,158 +1218,6 @@
     property Component defaultContent
     property real activationThreshold
     property bool releaseToRefresh
-Switch 0.1 1.0
-CheckBox
-Tab 0.1 1.0
-PageTreeNode
-    property string title
-    property url iconSource
-    property Item page
-    readonly property int index
-    property internal __protected
-TabBar 0.1 1.0
-Toolkit.StyledItem
-    property Item tabsItem
-    property var model
-    readonly property bool pressed
-    property bool selectionMode
-    property int selectedIndex
-    property bool alwaysSelectionMode
-    property bool animate
-Tabs 0.1 1.0
-PageTreeNode
-    property int selectedTabIndex
-    readonly property Tab selectedTab
-    readonly property Item currentPage
-    property TabBar tabBar
-    default property list<Item> tabChildren
-    readonly property int count
-    signal modelChanged()
-    property var __model
-TextArea 0.1 1.0
-Ubuntu.StyledItem
-    property bool highlighted
-    property string placeholderText
-    readonly property string displayText
-    property bool selectByMouse
-    property bool autoExpand
-    property bool autoSize
-    property int maximumLineCount
-    property real contentWidth
-    property real contentHeight
-    property var popover
-    property bool activeFocusOnPress
-    property url baseUrl
-    property bool canPaste
-    property bool canRedo
-    property bool canUndo
-    property color color
-    property Component cursorDelegate
-    property int cursorPosition
-    property rectangle cursorRectangle
-    property bool cursorVisible
-    property enumeration effectiveHorizontalAlignment
-    property font font
-    property enumeration horizontalAlignment
-    property bool inputMethodComposing
-    property enumeration inputMethodHints
-    property int length
-    property int lineCount
-    property enumeration mouseSelectionMode
-    property enumeration persistentSelection
-    property bool readOnly
-    property enumeration renderType
-    property string selectedText
-    property color selectedTextColor
-    property color selectionColor
-    property int selectionEnd
-    property int selectionStart
-    property string text
-    property enumeration textFormat
-    property enumeration verticalAlignment
-    property enumeration wrapMode
-    signal linkActivated(string link)
-    function copy()
-    function cut()
-    function deselect()
-    function insert(position, text)
-    function positionAt(x, y)
-    function isRightToLeft(start, end)
-    function moveCursorSelection(position, mode)
-    function paste(data)
-    function positionToRectangle(position)
-    function redo()
-    function select(start, end)
-    function selectAll()
-    function selectWord()
-    function getFormattedText(start, end)
-    function getText(start, end)
-    function remove(start, end)
-    function undo()
-TextField 0.1 1.0
-ActionItem
-    property bool highlighted
-    property string placeholderText
-    property bool hasClearButton
-    property Component customSoftwareInputPanel
-    property var popover
-    property list<Object> primaryItem
-    property list<Object> secondaryItem
-    property bool errorHighlight
-    property bool acceptableInput
-    property bool activeFocusOnPress
-    property bool autoScroll
-    property bool canPaste
-    property bool canRedo
-    property bool canUndo
-    property color color
-    property real contentHeight
-    property real contentWidth
-    property Component cursorDelegate
-    property int cursorPosition
-    property rectangle cursorRectangle
-    property bool cursorVisible
-    property string displayText
-    property enumeration echoMode
-    property font font
-    property string inputMask
-    property bool inputMethodComposing
-    property enumeration inputMethodHints
-    property int length
-    property int maximumLength
-    property enumeration mouseSelectionMode
-    property bool persistentSelection
-    property bool readOnly
-    property enumeration renderType
-    property bool selectByMouse
-    readonly property string selectedText
-    property int selectionStart
-    property int selectionEnd
-    property string text
-    property Validator validator
-    property enumeration horizontalAlignment
-    property enumeration effectiveHorizontalAlignment
-    property enumeration verticalAlignment
-    property string passwordCharacter
-    property color selectionColor
-    property color selectedTextColor
-    signal accepted()
-    function copy()
-    function cut()
-    function paste(data)
-    function deselect()
-    function insert(position, text)
-    function positionAt(x, position)
-    function positionToRectangle(pos)
-    function select(start, end)
-    function selectAll()
-    function selectWord()
-    function isRightToLeft(start, end)
-    function moveCursorSelection(position, mode)
-    function redo()
-    function undo()
-    function remove(start, end)
-    function getText(start, end)
 Palette 0.1
 QtObject
     property PaletteValues normal
@@ -656,49 +1252,6 @@
     property color field
     property color fieldText
     property color selection
-ToolbarButton 0.1 1.0
-ActionItem
-ToolbarItems 0.1 1.0
-Item
-    default property list<Object> contents
-    property Item back
-    property Item pageStack
-    property bool opened
-    property bool locked
-UbuntuColors 1.1
-QtObject
-    readonly property color orange
-    readonly property color lightAubergine
-    readonly property color midAubergine
-    readonly property color darkAubergine
-    readonly property color warmGrey
-    readonly property color coolGrey
-    property Gradient orangeGradient
-    property Gradient greyGradient
-    readonly property color lightGrey
-    readonly property color darkGrey
-    readonly property color red
-    readonly property color green
-    readonly property color blue
-    readonly property color purple
-UbuntuColors 0.1 1.0
-QtObject
-    readonly property color orange
-    readonly property color lightAubergine
-    readonly property color midAubergine
-    readonly property color darkAubergine
-    readonly property color warmGrey
-    readonly property color coolGrey
-    property Gradient orangeGradient
-    property Gradient greyGradient
-UbuntuListView 0.1 1.0
-ListView
-    property int expandedIndex
-UbuntuListView 1.1
-UbuntuListView
-    property PullToRefresh pullToRefresh
-UbuntuNumberAnimation 0.1 1.0
-NumberAnimation
 PerformanceOverlay 0.1 1.0
 Item
     property bool active
 
=== modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-09-03 08:17:24 +0000
+++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2015-05-06 10:32:32 +0000
@@ -5,23 +5,28 @@
 usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
 usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
-usr/lib/*/qt5/qml/Ubuntu/Components/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/10/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/11/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
 usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
 usr/lib/*/qt5/qml/Ubuntu/Components/artwork
-usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/artwork
 usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/*.js
-usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Styles/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Test
 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo
 
=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-04-25 07:10:57 +0000
+++ documentation/ubuntu-theming.qdoc	2015-05-06 10:32:32 +0000
@@ -125,7 +125,7 @@
  * Other styles are requested to provide additional \e content elements, which are then
  * positioned by the styled component separately from the main visuals given by the style.
  * A typical example of such a style API is the PullToRefresh component's style:
- * \snippet Styles/PullToRefreshStyle.qml 0
+ * \snippet Styles/1.2/PullToRefreshStyle.qml 0
  * The default style implementation can be found under Ubuntu.Components.Themes.Ambiance
  * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml}
  * {PullToRefreshStyle.qml}.
 
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-04-27 06:08:34 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-05-06 10:32:32 +0000
@@ -11,8 +11,14 @@
 sourcedirs += ../modules/Ubuntu/Test
 headerdirs += ../modules/Ubuntu/Test/plugin
 exampledirs += snippets
-exampledirs += ../examples/1.3
+exampledirs += ../examples
 exampledirs += ../modules/Ubuntu/Components
+excludedirs += ../modules/Ubuntu/Components/1.0
+excludedirs += ../modules/Ubuntu/Components/1.1
+excludedirs += ../modules/Ubuntu/Components/1.2
+excludedirs += ../modules/Ubuntu/Components/ListItems/1.2
+excludedirs += ../modules/Ubuntu/Components/Pickers/1.2
+excludedirs += ../modules/Ubuntu/Components/Popups/1.2
 excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
 excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark
 imagedirs = images
 
=== removed directory 'examples/1.3'
=== removed file 'examples/1.3/1.3.pro'
--- examples/1.3/1.3.pro	2015-04-27 06:08:34 +0000
+++ examples/1.3/1.3.pro	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \ 
-    ubuntu-ui-toolkit-gallery\
-    locale \
-    jokes \
-    unit-converter \
-    calculator \
-    customtheme
-
 
=== renamed directory 'examples/1.3/calculator' => 'examples/calculator'
=== renamed directory 'examples/1.3/customtheme' => 'examples/customtheme'
=== modified file 'examples/examples.pro'
--- examples/examples.pro	2015-04-27 06:08:34 +0000
+++ examples/examples.pro	2015-05-06 10:32:32 +0000
@@ -1,22 +1,9 @@
 TEMPLATE = subdirs
 
-SUBDIRS += \ 
-    1.3
-
-
-#examples = jokes unit-converter
-#filetypes = qml png svg js jpg wav
- 
-#OTHER_FILES = ""
-
-#for(example, examples) {
-#  for(filetype, filetypes) {
-#    OTHER_FILES += $$example/*.$$filetype
-#  }
-#}
-
-#other_files.path = /usr/lib/ubuntu-ui-toolkit/examples
-#other_files.files = $$OTHER_FILES
-
-#INSTALLS += other_files
-
+SUBDIRS += \
+    ubuntu-ui-toolkit-gallery\
+    locale \
+    jokes \
+    unit-converter \
+    calculator \
+    customtheme
 
=== renamed directory 'examples/1.3/jokes' => 'examples/jokes'
=== renamed directory 'examples/1.3/locale' => 'examples/locale'
=== modified file 'examples/locale/locale.qml'
--- examples/1.3/locale/locale.qml	2015-04-09 09:42:36 +0000
+++ examples/locale/locale.qml	2015-05-06 10:32:32 +0000
@@ -17,7 +17,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 /*!
   \brief An application to test locales on the device
 
=== renamed directory 'examples/1.3/ubuntu-ui-toolkit-gallery' => 'examples/ubuntu-ui-toolkit-gallery'
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 
 Template {
     objectName: "buttonsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.Popups 1.3
 
 Template {
     objectName: "dialogsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Icons.qml	2015-05-06 10:32:32 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 import Qt.labs.folderlistmodel 2.1
 
 Template {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-04-09 09:42:36 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3 as Toolkit
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Template {
     objectName: "listItemsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Pickers.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-04-09 09:42:36 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Pickers 1.0
+import Ubuntu.Components.Pickers 1.3
 
 Template {
     objectName: "pickersTemplate"
@@ -209,4 +209,15 @@
             }
         }
     }
+
+    TemplateSection {
+        title: "PickerPanel"
+        TextField {
+            id: textField
+            readOnly: true
+            property date date: new Date()
+            text: date.toISOString()
+            Mouse.onClicked: PickerPanel.openDatePicker(textField, "date");
+        }
+    }
 }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Popover.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 Template {
     objectName: "popoversTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Sheet.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 Template {
     objectName: "sheetsTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Template {
     objectName: "ubuntuListViewTemplate"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-05-06 10:32:32 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 MainView {
     id: gallery
 
=== renamed directory 'examples/1.3/unit-converter' => 'examples/unit-converter'
=== renamed directory 'modules/Ubuntu/Components/10' => 'modules/Ubuntu/Components/1.0'
=== renamed file 'modules/Ubuntu/Components/10/10.pro' => 'modules/Ubuntu/Components/1.0/1.0.pro'
--- modules/Ubuntu/Components/10/10.pro	2014-11-21 15:26:25 +0000
+++ modules/Ubuntu/Components/1.0/1.0.pro	2015-05-06 10:32:32 +0000
@@ -2,8 +2,8 @@
 
 CONFIG+=ubuntu_qml_module
 
-uri = Ubuntu.Components.10
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+uri = Ubuntu.Components
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.0
 
 qml_files.installPath = $$installPath
 qml_files.files = *.qml \
 
=== renamed directory 'modules/Ubuntu/Components/11' => 'modules/Ubuntu/Components/1.1'
=== renamed file 'modules/Ubuntu/Components/11/11.pro' => 'modules/Ubuntu/Components/1.1/1.1.pro'
--- modules/Ubuntu/Components/11/11.pro	2014-11-21 15:26:25 +0000
+++ modules/Ubuntu/Components/1.1/1.1.pro	2015-05-06 10:32:32 +0000
@@ -2,8 +2,8 @@
 
 CONFIG+=ubuntu_qml_module
 
-uri = Ubuntu.Components.11
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+uri = Ubuntu.Components
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.1
 
 qml_files.installPath = $$installPath
 qml_files.files = *.qml
 
=== modified file 'modules/Ubuntu/Components/1.1/Haptics.qml'
--- modules/Ubuntu/Components/11/Haptics.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/1.1/Haptics.qml	2015-05-06 10:32:32 +0000
@@ -17,7 +17,7 @@
 pragma Singleton
 import QtQuick 2.4
 import QtFeedback 5.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3 // FIXME move back to import 1.2 once we get 1.2 sources in
 
 /*!
   \qmltype Haptics
 
=== added directory 'modules/Ubuntu/Components/1.2'
=== added file 'modules/Ubuntu/Components/1.2/1.2.pro'
--- modules/Ubuntu/Components/1.2/1.2.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/1.2.pro	2015-05-06 10:32:32 +0000
@@ -0,0 +1,15 @@
+TEMPLATE = aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
+
+qml_files.installPath = $$installPath
+qml_files.files = *.qml
+
+# javascript files
+js_files.installPath = $$installPath
+js_files.files = *.js
+
+UBUNTU_QML_MODULE_FILES += qml_files js_files
 
=== added file 'modules/Ubuntu/Components/1.2/AbstractButton.qml'
--- modules/Ubuntu/Components/1.2/AbstractButton.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/AbstractButton.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmlabstract AbstractButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief The AbstractButton class defines the behavior of the button.
+
+    This class defines the behavior of the button: it defines the MouseArea
+    and the states.
+    All components deriving from this class support haptic feedback out of the box.
+*/
+ActionItem {
+    id: button
+
+    /*!
+      If an action is specified, the button's clicked signal will trigger the action.
+      Subclasses of AbstractButton can use other properties of action (for example
+      the text and iconName).
+      \qmlproperty Action action
+     */
+
+    /*!
+       This handler is called when there is a mouse click on the button
+       and the button is not disabled. If \b action is defined,
+       the action will be triggered.
+    */
+    signal clicked()
+
+    /*!
+      If a button is clicked, its triggered() signal will automatically be called.
+     */
+    onClicked: button.trigger()
+
+    Keys.onEnterPressed: clicked()
+    Keys.onReturnPressed: clicked()
+
+    /*!
+      This handler is called when there is a long press.
+     */
+    signal pressAndHold()
+
+    /*!
+      True if the user presses a mouse button in the button's mouse area.
+     */
+    property bool pressed: mouseArea.pressed
+
+    /*!
+      True if the mouse cursor hovers over the button's mouse area.
+     */
+    property bool hovered: __acceptEvents && mouseArea.containsMouse
+
+    /*!
+      \internal
+      Disable or enable signal emition by default.
+      Some classes want to emit the signal by themselves (ListItem.Standard)
+     */
+    property bool __acceptEvents: true
+
+    /*!
+      \internal
+      To get the properties of the mouse area in subclasses.
+     */
+    property alias __mouseArea: mouseArea
+
+    activeFocusOnPress: true
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        // if mouseArea is given a new value, disable defaultMouseArea
+        // 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) {
+                // FIXME (Vivid) call this in the style rather than from AbstractButton
+                Haptics.play();
+                button.clicked()
+            }
+        }
+        onPressAndHold: {
+            if (button.__acceptEvents) {
+                button.pressAndHold()
+            }
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/ActionItem.qml'
--- modules/Ubuntu/Components/1.2/ActionItem.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/ActionItem.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmlabstract ActionItem
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief A visual representation of an Action. The API of ActionItem is a
+        copy of the API of \l Action, with additional properties to define
+        visual aspects of the ActionItem.
+
+        If \l action is set, the values of the other properties will by default
+        be identical to the \l Action's property values. Setting the other properties
+        will override the properties copied from the \l Action.
+
+        See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
+        in a toolbar.
+*/
+StyledItem {
+    id: actionItem
+
+    /*!
+      The \l Action associated with this ActionItem. If action is set,
+      the values of the Action properties are copied to the values of
+      the ActionItem properties.
+     */
+    property Action action: null
+
+    visible: action ? action.visible : true
+    enabled: action ? action.enabled : true
+
+    /*!
+      The title of the actionItem.
+      Default value: action.text
+     */
+    property string text: action ? action.text : ""
+
+    /*!
+      The image associated with the actionItem.
+      Default value: action.iconSource.
+
+      This is the URL of any image file
+      If both iconSource and iconName are defined, iconName will be ignored.
+     */
+    property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
+
+    /*!
+      The icon associated with the actionItem in the suru icon theme.
+      Default value: action.iconName.
+
+      \note The complete list of icons available in Ubuntu is not published yet.
+            For now please refer to the folders where the icon themes are installed:
+            \list
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
+              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+            \endlist
+            These 2 separate icon themes will be merged soon.
+
+      If both iconSource and iconName are defined, iconName will be ignored.
+     */
+    property string iconName: action ? action.iconName : ""
+
+    /*!
+      Called when the actionItem is triggered.
+     */
+    signal triggered(var value)
+
+    /*!
+      If \l action is set, this will trigger it.
+    */
+    onTriggered: if (action) action.trigger(value)
+
+    /*!
+      Trigger this action item if it is enabled.
+     */
+    function trigger(value) {
+        var passingValue = value ? value : null
+        if (actionItem.enabled) actionItem.triggered(passingValue);
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/ActionList.qml'
--- modules/Ubuntu/Components/1.2/ActionList.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/ActionList.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmltype ActionList
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief List of \l Action items
+*/
+
+QtObject {
+    id: list
+    // internal objects using nested elements,
+    // which isn't allowed by QtObject; this fix makes this possible
+    /*!
+      Default property to allow adding of children.
+      \qmlproperty list<Action> children
+      \default
+      */
+    default property alias children: list.actions
+
+    /*!
+      List of already defined actions when not defining them as children of the ActionList.
+      Note that when you set this property, the children of the ActionList will be ignored,
+      so do not set the list and define children.
+
+      The advantage of setting actions over using the children is that the same
+      \l Action items can be used in several sets of actions.
+      */
+    property list<Action> actions
+}
 
=== added file 'modules/Ubuntu/Components/1.2/ActivityIndicator.qml'
--- modules/Ubuntu/Components/1.2/ActivityIndicator.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/ActivityIndicator.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmltype ActivityIndicator
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief The ActivityIndicator component visually indicates that a task of
+    unknown duration is in progress, e.g. busy indication, connection in progress
+    indication, etc.
+
+    Note: for time consuming JavaScript operations use WorkerScript, otherwise no
+    UI interaction will be possible and the ActicityIndicator animation will freeze.
+
+    Example:
+    \qml
+    Item {
+        ActivityIndicator {
+            id: activity
+        }
+
+        Button {
+            id: toggleActive
+            text: (activity.running) ? "Deactivate" : "Activate"
+            onClicked: activity.running = !activity.running
+        }
+    }
+    \endqml
+*/
+AnimatedItem {
+    id: indicator
+
+    /*!
+       Presents whether there is activity to be visualized or not. The default value is false.
+       When activated (set to true), an animation is shown indicating an ongoing activity, which
+       continues until deactivated (set to false).
+    */
+    property bool running: false
+
+    implicitWidth: units.gu(3)
+    implicitHeight: units.gu(3)
+
+    style: Theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
+}
 
=== added file 'modules/Ubuntu/Components/1.2/AnimatedItem.qml'
--- modules/Ubuntu/Components/1.2/AnimatedItem.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/AnimatedItem.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 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/>.
+ */
+
+/*!
+    \qmltype AnimatedItem
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief The AnimatedItem drives the animated components behavior inside a Flickable.
+    Reports whether the component whos parent is a Flickable is in the visible area or not,
+    so derived components can pause animations while off-screen.
+
+*/
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+StyledItem {
+    id: root
+    /*!
+      \deprecated
+      Specifies whether the component is on the visible area of the Flickable or not.
+    */
+    property bool onScreen: true
+}
 
=== added file 'modules/Ubuntu/Components/1.2/AppHeader.qml'
--- modules/Ubuntu/Components/1.2/AppHeader.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/AppHeader.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2013-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.4
+import Ubuntu.Components 1.2 as Components
+
+/*!
+    \internal
+    \qmltype AppHeader
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+*/
+Components.StyledItem {
+    id: header
+
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    y: 0
+
+    /*!
+      Animate showing and hiding of the header.
+     */
+    property bool animate: true
+
+    /*!
+      The background color of the divider. Value set by MainView.
+     */
+    property color dividerColor
+
+    /*!
+      The background color of the panel. Value set by MainView.
+     */
+    property color panelColor
+
+    Behavior on y {
+        enabled: animate && !(header.flickable && header.flickable.moving)
+        SmoothedAnimation {
+            duration: Components.UbuntuAnimation.BriskDuration
+        }
+    }
+
+    /*! \internal */
+    onHeightChanged: {
+        internal.checkFlickableMargins();
+        internal.movementEnded();
+    }
+
+    visible: title || contents || tabsModel
+    onVisibleChanged: {
+        internal.checkFlickableMargins();
+    }
+
+    /*!
+      Show the header
+     */
+    function show() {
+        header.y = 0;
+    }
+
+    /*!
+      Hide the header
+     */
+    function hide() {
+        header.y = - header.height;
+    }
+
+    /*!
+      The text to display in the header
+     */
+    property string title: ""
+    onTitleChanged: {
+        header.show();
+    }
+
+    /*!
+      The contents of the header. If this is set, \l title will be ignored.
+     */
+    property Item contents: null
+    onContentsChanged: {
+        header.show();
+    }
+
+    /*!
+      A model of tabs to represent in the header.
+      This is automatically set by \l Tabs.
+     */
+    property var tabsModel: null
+
+    /*!
+      If it is possible to pop this PageStack, a back button will be
+      shown in the header.
+     */
+    property var pageStack: null
+
+    /*!
+      \deprecated
+      \qmlproperty list<Action> actions
+      The list of actions actions that will be shown in the header.
+      DEPRECATED. Use Page.head.actions instead.
+     */
+    property var actions
+    onActionsChanged: print("WARNING: Header.actions property is DEPRECATED. "+
+                            "Use Page.head.actions instead.")
+
+    /*!
+      \internal
+      \deprecated
+      Action shown before the title. Setting this will disable the back
+      button and tabs drawer button in the new header and replace it with a button
+      representing the action below.
+      DEPRECATED. Use Page.head.backAction property instead.
+     */
+    property var __customBackAction: null
+
+    // FIXME: Currently autopilot can only get visual items, but once bug #1273956
+    //  is fixed to support non-visual items, a QtObject may be used.
+    //  --timp - 2014-03-20
+    Item {
+        // FIXME: This is a workaround to be able to get the properties of
+        //  tabsModel in an autopilot test.
+        objectName: "tabsModelProperties"
+        property int count: tabsModel ? tabsModel.count : 0
+        property int selectedIndex: tabsModel ? tabsModel.selectedIndex : -1
+    }
+    Item {
+        // FIXME: This is a workaround to be able to get the properties of
+        //  the sections in an autopilot test.
+        objectName: "sectionsProperties"
+        property int selectedIndex: header.config ? header.config.sections.selectedIndex : -1
+    }
+
+    /*!
+      The flickable that controls the movement of the header.
+      Will be set automatically by Pages inside a MainView, but can
+      be overridden.
+     */
+    property Flickable flickable: null
+    onFlickableChanged: {
+        internal.checkFlickableMargins();
+        internal.connectFlickable();
+        header.show();
+    }
+
+    /*!
+      Set by \l MainView
+     */
+    property bool useDeprecatedToolbar: true
+
+    /*!
+      Configuration of the header.
+     */
+    property PageHeadConfiguration config: null
+
+    QtObject {
+        id: internal
+
+        /*!
+          Track the y-position inside the flickable.
+         */
+        property real previousContentY: 0
+
+        /*!
+          The previous flickable to disconnect events
+         */
+        property Flickable previousFlickable: null
+
+        /*!
+          Disconnect previous flickable, and connect the new one.
+         */
+        function connectFlickable() {
+            if (previousFlickable) {
+                previousFlickable.contentYChanged.disconnect(internal.scrollContents);
+                previousFlickable.movementEnded.disconnect(internal.movementEnded);
+                previousFlickable.interactiveChanged.disconnect(internal.interactiveChanged);
+            }
+            if (flickable) {
+                // Connect flicking to movements of the header
+                previousContentY = flickable.contentY;
+                flickable.contentYChanged.connect(internal.scrollContents);
+                flickable.movementEnded.connect(internal.movementEnded);
+                flickable.interactiveChanged.connect(internal.interactiveChanged);
+                flickable.contentHeightChanged.connect(internal.contentHeightChanged);
+            }
+            previousFlickable = flickable;
+        }
+
+        /*!
+          Update the position of the header to scroll with the flickable.
+         */
+        function scrollContents() {
+            // Avoid updating header.y when rebounding or being dragged over the bounds.
+            if (!flickable.atYBeginning && !flickable.atYEnd) {
+                var deltaContentY = flickable.contentY - previousContentY;
+                // FIXME: MathUtils.clamp  is expensive. Fix clamp, or replace it here.
+                header.y = MathUtils.clamp(header.y - deltaContentY, -header.height, 0);
+            }
+            previousContentY = flickable.contentY;
+        }
+
+        /*!
+          Fully show or hide the header, depending on its current y.
+         */
+        function movementEnded() {
+            if (flickable && flickable.contentY < 0) header.show();
+            else if (header.y < -header.height/2) header.hide();
+            else header.show();
+        }
+
+        /*
+          Content height of flickable changed
+         */
+        function contentHeightChanged() {
+            if (flickable && flickable.height >= flickable.contentHeight) header.show();
+        }
+
+        /*
+          Flickable became interactive or non-interactive.
+         */
+        function interactiveChanged() {
+            if (flickable && !flickable.interactive) header.show();
+        }
+
+        /*
+          Check the topMargin of the flickable and set it if needed to avoid
+          contents becoming unavailable behind the header.
+         */
+        function checkFlickableMargins() {
+            if (header.flickable) {
+                var headerHeight = header.visible ? header.height : 0
+                if (flickable.topMargin !== headerHeight) {
+                    var previousHeaderHeight = flickable.topMargin;
+                    flickable.topMargin = headerHeight;
+                    // push down contents when header grows,
+                    // pull up contents when header shrinks.
+                    flickable.contentY -= headerHeight - previousHeaderHeight;
+                }
+            }
+        }
+    }
+
+    style: header.useDeprecatedToolbar ? Theme.createStyleComponent("HeaderStyle.qml", header) :
+                                         Theme.createStyleComponent("PageHeadStyle.qml", header)
+}
 
=== added file 'modules/Ubuntu/Components/1.2/Captions.qml'
--- modules/Ubuntu/Components/1.2/Captions.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/Captions.qml	2015-05-06 10:32:32 +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
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/CheckBox.qml'
--- modules/Ubuntu/Components/1.2/CheckBox.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/CheckBox.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmltype CheckBox
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief CheckBox is a component with two states, checked or unchecked. It can
+    be used to set boolean options. The behavior is the same as \l Switch, the
+    only difference is the graphical style.
+
+    \l {https://design.ubuntu.com/apps/building-blocks/selection}{See also the Design Guidelines on selection}.
+
+    Example:
+    \qml
+    Item {
+        CheckBox {
+            checked: true
+        }
+    }
+    \endqml
+*/
+AbstractButton {
+    id: checkBox
+
+    /*!
+      Specifies whether the checkbox is checked or not. By default the property
+      is set to false.
+    */
+    property bool checked: false
+
+    /*!
+      \internal
+     */
+    onTriggered: checked = !checked
+
+    style: Theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
+}
 
=== added file 'modules/Ubuntu/Components/1.2/ComboButton.qml'
--- modules/Ubuntu/Components/1.2/ComboButton.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/ComboButton.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,367 @@
+/*
+ * 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.4
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.2 as Toolkit
+
+/*!
+    \qmltype ComboButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Ubuntu button providing a drop-down panel visualizing custom options.
+
+    The component is composed of three main blocks: \b {main button}, \b {dropdown}
+    and \b {combo list}.
+
+    The \a {main button} holds the main functionailty of the component, and it is
+    located at the left-top side of the expanded button. The \a clicked() signal
+    is triggered only when this button is pressed.
+
+    The \a {dropdown} is a button located on the right of the main button. Its
+    functionality is to drive the component's expanded state.
+
+    The \a {combo list} is a panel showing the content specified in \l comboList
+    property when expanded. The content is stretched horizontally to the component's
+    width, and its height is controlled by the \l expandedHeight property as follows:
+    \list
+    \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.4
+        import Ubuntu.Components 1.2
+        ComboButton {
+            text: "smaller content"
+            Rectangle {
+                height: units.gu(5) // smaller than the default expandedHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \li If the content height is greater than \l expandedHeight, the combo list will
+        expand till the height specified by the property and the content will be
+        scrolled; in case the combo list content is one single Flickable, ListView,
+        GridView or PathView, the content scrolling will be provided by the content
+        itself.
+        \qml
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
+        ComboButton {
+            text: "long scrolled content"
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Rectangle {
+                        height: units.gu(5)
+                        color: "blue"
+                    }
+                }
+            }
+        }
+        \endqml
+    \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.4
+        import Ubuntu.Components 1.2
+        import Ubuntu.Components.ListItems 1.0
+        ComboButton {
+            text: "listview"
+            ListView {
+                model: 10
+                delegate: Standard {
+                    text: "Item #" + modelData
+                }
+            }
+        }
+        \endqml
+    \li Vertical anchoring of combo list content to its parent is not possible
+        as the expansion calculation is done based on the combo list content height.
+        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.4
+        import Ubuntu.Components 1.2
+        ComboButton {
+            id: combo
+            text: "smaller content"
+            Rectangle {
+                height: combo.comboListHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \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.4
+        import Ubuntu.Components 1.2
+        ComboButton {
+            text: "auto-sized content"
+            expandedHeight: -1
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Button {
+                        text: "Button #" + modelData
+                    }
+                }
+            }
+        }
+        \endqml
+    \endlist
+
+    The combo list can be expanded/collapsed either through the \l expanded property
+    or by clicking on the dropdown button. It is not collapsed when pressing the main
+    button or clicking on the combo list. In order to do an auto-collapsing button
+    you must reset the expanded property (set it to false) when the main button is
+    clicked or when a selection is taken from the combo list content. The following
+    example illustrates a possible implementation.
+
+    \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
+
+    ComboButton {
+        id: combo
+        text: "Auto closing"
+        expanded: true
+        expandedHeight: units.gu(30)
+        onClicked: expanded = false
+        UbuntuListView {
+            width: parent.width
+            height: combo.comboListHeight
+            model: 20
+            delegate: Standard {
+                text: "Action #" + modelData
+                onClicked: {
+                    combo.text = text;
+                    combo.expanded = false;
+                }
+            }
+        }
+    }
+    \endqml
+
+    \section2 Styling
+    The style of the component is defined in \l ComboButtonStyle.
+  */
+Toolkit.Button {
+    id: combo
+
+    /*!
+      Specifies whether the combo list is expanded or not. The default falue is
+      false.
+      */
+    property bool expanded: false
+
+    /*!
+      The property holds the height of the component when collapsed. By default
+      the value is the implicit height of the component.
+      */
+    property real collapsedHeight: implicitHeight
+
+    /*!
+        The property holds the maximum height value the component should expand.
+        When setting the property, remember to take into account the \l collapsedHeight
+        value. The best practice is to use bind it with collapsedHeight.
+        \qml
+        ComboButton {
+            text: "altered expandedHeight"
+            expandedHeight: collapsedHeight + units.gu(25)
+        }
+        \endqml
+
+        A value of -1 will instruct the component to expand the combo list as
+        much as its content height is.
+
+        The default value is \l collapsedHeight + 19.5 GU, so at least 3 ListItems
+        can fit in the combo list.
+        \sa collapsedHeight
+      */
+    property real expandedHeight: collapsedHeight + units.gu(19.5)
+
+    /*!
+      The property holds the maximum combo list height allowed based on the
+      \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.4
+      import Ubuntu.Components 1.2
+      import Ubuntu.Components.ListItems 0.1
+      ComboButton {
+          id: combo
+          text: "Full comboList size"
+          ListView {
+              anchors {
+                  left: parent.left
+                  right: parent.right
+              }
+              height: combo.comboListHeight
+              model: 20
+              delegate: Standard {
+                  text: "Action #" + modelData
+              }
+          }
+      }
+      \endqml
+
+      \sa collapsedHeight, expandedHeight
+      */
+    readonly property real comboListHeight: (expandedHeight < 0) ?
+                            comboListHolder.height :
+                            (expandedHeight - collapsedHeight -
+                            (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
+
+    /*!
+        \qmlproperty list<Item> comboList
+        \default
+        Property holding the list of items to be shown in the combo list. Being
+        a default property children items declared will land in the combo list.
+        \note The component is not responsible for layouting the content. It only
+        provides scrolling abilities for the case the content exceeds the defined
+        expanded height.
+      */
+    default property alias comboList: comboListHolder.data
+
+    /* ----------------- Color and font configurations ----------------- */
+    /*!
+      The property specifies the color of the dropdown button and the combo list
+      for both collapsed and expanded states. You can use \l expanded to define
+      different colors for expanded or collapsed states.
+      */
+    property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
+
+
+    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
+
+    Component.onCompleted: {
+        // update mouse area to report clicks only on the main button area
+        // area excluding dropDown button and combo list
+        // we must do separate bindings as __mouseArea is a read-only property
+        __mouseArea.anchors.fill = undefined;
+        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
+        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
+        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
+        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
+        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
+        // for autopilot, set the main button name
+        __mouseArea.objectName = "combobutton_mainbutton";
+
+        // bind a height calculation to avoid unwanted change
+        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
+    }
+
+    // dropdown button
+    AbstractButton {
+        id: dropDown
+        objectName: "combobutton_dropdown"
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+        width: combo.__styleInstance ? combo.__styleInstance.dropDownWidth : 0
+        height: combo.collapsedHeight
+        // open dropdown when pressed, not when clicked
+        onClicked: {
+            // toggle expanded
+            combo.expanded = !combo.expanded;
+        }
+    }
+
+    // expansion list
+    Flickable {
+        id: comboHolder
+        objectName: "combobutton_contentflicker"
+        parent: combo.__styleInstance ? combo.__styleInstance.comboListHolder : combo
+        anchors.fill: parent
+        interactive: combo.expanded && !contentIsFlickable() && (combo.expandedHeight > 0)
+        flickableDirection: Flickable.VerticalFlick
+        contentHeight: comboListHolder.height
+
+        // consider PathView as Flickable in this case as well!
+        function contentIsFlickable() {
+            return (comboListHolder.children.length === 1) &&
+                    comboListHolder.children[0].hasOwnProperty("flicking");
+        }
+
+        Item {
+            id: comboListHolder
+            objectName: "combobutton_combolist"
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            // stretch children width to holder's width
+            // must do binding to height manually to avoid binding loops caused
+            // by the vertical stretching when the component is a single flickable
+            property bool stretch: (combo.expandedHeight > 0 && comboHolder.contentIsFlickable())
+            onStretchChanged: stretchChildren()
+            onChildrenChanged: stretchChildren()
+            function stretchChildren() {
+                for (var i in comboListHolder.children) {
+                    var child = comboListHolder.children[i];
+                    if (comboListHolder.stretch) {
+                        child.anchors.left = undefined;
+                        child.anchors.right = undefined;
+                        child.anchors.fill = comboListHolder;
+                        comboListHolder.height = Qt.binding(function() {
+                            return combo.comboListHeight;
+                        });
+                    } else {
+                        child.anchors.left = comboListHolder.left;
+                        child.anchors.right = comboListHolder.right;
+                        comboListHolder.height = Qt.binding(function() {
+                            return comboListHolder.childrenRect.height;
+                        });
+                    }
+                }
+            }
+        }
+    }
+    Scrollbar {
+        flickableItem: comboHolder
+    }
+
+    /*
+      Drive the expansion height of the combo list holder
+      This is a common functionaity in all combo buttons, therefore we can have it
+      in the main component.
+      */
+    Binding {
+        target: combo.__styleInstance.comboListPanel
+        property: "height"
+        value: {
+            if (!expanded) {
+                return 0;
+            }
+            if (comboListHolder.stretch) {
+                return combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            }
+
+            var h = comboListHolder.height;
+            var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            if (combo.expandedHeight < 0) {
+                return max;
+            }
+
+            return Toolkit.MathUtils.clamp(h, 0, max);
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/CrossFadeImage10.qml'
--- modules/Ubuntu/Components/1.2/CrossFadeImage10.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/CrossFadeImage10.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.2 as Ubuntu
+
+/*!
+  \internal
+  Documentation is in CrossFadeImage.qdoc
+*/
+Item {
+    id: crossFadeImage
+
+    property url source
+
+    property int fillMode : Image.PreserveAspectFit
+
+    property int fadeDuration: Ubuntu.UbuntuAnimation.FastDuration
+
+    // FIXME: Support resetting sourceSize
+    property size sourceSize: internals.loadingImage ? Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height) : Qt.size(0, 0)
+
+    readonly property bool running: nextImageFadeIn.running
+
+    readonly property int status: internals.loadingImage ? internals.loadingImage.status : Image.Null
+
+    Binding {
+        target: crossFadeImage
+        property: "sourceSize"
+        value: internals.loadingImage ? Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height) : Qt.size(0, 0)
+        when: internals.forcedSourceSize === undefined
+    }
+
+    /*!
+      \internal
+     */
+    onSourceSizeChanged: {
+        if (internals.loadingImage && (sourceSize != Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height))) {
+            internals.forcedSourceSize = sourceSize;
+        }
+    }
+
+    QtObject {
+        id: internals
+
+        /*! \internal
+          Source size specified by the setting crossFadeImage.sourceSize.
+         */
+        property size forcedSourceSize
+
+        /*! \internal
+          Defines the image currently being shown
+        */
+        property Image currentImage: image1
+
+        /*! \internal
+          Defines the image being changed to
+        */
+        property Image nextImage: image2
+
+        property Image loadingImage: currentImage
+
+        function swapImages() {
+            internals.currentImage.z = 0;
+            internals.nextImage.z = 1;
+            nextImageFadeIn.start();
+
+            var tmpImage = internals.currentImage;
+            internals.currentImage = internals.nextImage;
+            internals.nextImage = tmpImage;
+        }
+    }
+
+    Image {
+        id: image1
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: parent.fillMode
+        z: 1
+        Binding {
+            target: image1
+            property: "sourceSize"
+            value: internals.forcedSourceSize
+            when: internals.forcedSourceSize !== undefined
+        }
+    }
+
+    Image {
+        id: image2
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: parent.fillMode
+        z: 0
+        Binding {
+            target: image2
+            property: "sourceSize"
+            value: internals.forcedSourceSize
+            when: internals.forcedSourceSize !== undefined
+        }
+    }
+
+    /*!
+      \internal
+      Do the fading when the source is updated
+    */
+    onSourceChanged: {
+        // On creation, the souce handler is called before image pointers are set.
+        if (internals.currentImage === null) {
+            internals.currentImage = image1;
+            internals.nextImage = image2;
+        }
+
+        nextImageFadeIn.stop();
+
+        // Don't fade in initial picture, only fade changes
+        if (internals.currentImage.source == "") {
+            internals.currentImage.source = source;
+            internals.loadingImage = internals.currentImage;
+        } else {
+            nextImageFadeIn.stop();
+            internals.nextImage.opacity = 0.0;
+            internals.nextImage.source = source;
+            internals.loadingImage = internals.nextImage;
+
+            // If case the image is still in QML's cache, status will be "Ready" immediately
+            if (internals.nextImage.status === Image.Ready || internals.nextImage.source === "") {
+                internals.swapImages();
+            }
+        }
+    }
+
+    Connections {
+        target: internals.nextImage
+        onStatusChanged: {
+            if (internals.nextImage.status == Image.Ready) {
+                 internals.swapImages();
+             }
+        }
+    }
+
+    UbuntuNumberAnimation {
+        id: nextImageFadeIn
+        target: internals.nextImage
+        property: "opacity"
+        to: 1.0
+        duration: crossFadeImage.fadeDuration
+
+        onRunningChanged: {
+            if (!running) {
+                internals.nextImage.source = "";
+            }
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/CrossFadeImage11.qml'
--- modules/Ubuntu/Components/1.2/CrossFadeImage11.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/CrossFadeImage11.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.2 as Ubuntu
+
+/*!
+  \internal
+  Documentation is in CrossFadeImage.qdoc
+*/
+Item {
+    id: crossFadeImage
+
+    property url source
+
+    property int fillMode : Image.PreserveAspectFit
+
+    property int fadeDuration: Ubuntu.UbuntuAnimation.FastDuration
+
+    // FIXME: Support resetting sourceSize
+    property size sourceSize: internals.loadingImage ? Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height) : Qt.size(0, 0)
+
+    property string fadeStyle: "overlay"
+
+    readonly property bool running: nextImageFadeIn.running
+
+    readonly property int status: internals.loadingImage ? internals.loadingImage.status : Image.Null
+
+    Binding {
+        target: crossFadeImage
+        property: "sourceSize"
+        value: internals.loadingImage ? Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height) : Qt.size(0, 0)
+        when: internals.forcedSourceSize === undefined
+    }
+
+    /*!
+      \internal
+     */
+    onSourceSizeChanged: {
+        if (internals.loadingImage && (sourceSize != Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height))) {
+            internals.forcedSourceSize = sourceSize;
+        }
+    }
+
+    QtObject {
+        id: internals
+
+        /*! \internal
+          Source size specified by the setting crossFadeImage.sourceSize.
+         */
+        property size forcedSourceSize
+
+        /*! \internal
+          Defines the image currently being shown
+        */
+        property Image currentImage: image1
+
+        /*! \internal
+          Defines the image being changed to
+        */
+        property Image nextImage: image2
+
+        property Image loadingImage: currentImage
+
+        function swapImages() {
+            internals.currentImage.z = 0;
+            internals.nextImage.z = 1;
+            nextImageFadeIn.start();
+
+            var tmpImage = internals.currentImage;
+            internals.currentImage = internals.nextImage;
+            internals.nextImage = tmpImage;
+        }
+    }
+
+    QtObject {
+        // dummy object used to disable crossfade animation
+        id: fadeOutDummy
+        property real opacity
+    }
+
+    Image {
+        id: image1
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: parent.fillMode
+        z: 1
+        Binding {
+            target: image1
+            property: "sourceSize"
+            value: internals.forcedSourceSize
+            when: internals.forcedSourceSize !== undefined
+        }
+    }
+
+    Image {
+        id: image2
+        anchors.fill: parent
+        cache: false
+        asynchronous: true
+        fillMode: parent.fillMode
+        z: 0
+        Binding {
+            target: image2
+            property: "sourceSize"
+            value: internals.forcedSourceSize
+            when: internals.forcedSourceSize !== undefined
+        }
+    }
+
+    /*!
+      \internal
+      Do the fading when the source is updated
+    */
+    onSourceChanged: {
+        // On creation, the souce handler is called before image pointers are set.
+        if (internals.currentImage === null) {
+            internals.currentImage = image1;
+            internals.nextImage = image2;
+        }
+
+        nextImageFadeIn.stop();
+
+        // Don't fade in initial picture, only fade changes
+        if (internals.currentImage.source == "") {
+            internals.currentImage.source = source;
+            internals.loadingImage = internals.currentImage;
+        } else {
+            nextImageFadeIn.stop();
+            internals.nextImage.opacity = 0.0;
+            internals.nextImage.source = source;
+            internals.loadingImage = internals.nextImage;
+
+            // If case the image is still in QML's cache, status will be "Ready" immediately
+            if (internals.nextImage.status === Image.Ready || internals.nextImage.source === "") {
+                internals.swapImages();
+            }
+        }
+    }
+
+    Connections {
+        target: internals.nextImage
+        onStatusChanged: {
+            if (internals.nextImage.status == Image.Ready) {
+                 internals.swapImages();
+             }
+        }
+    }
+
+    ParallelAnimation {
+        id: nextImageFadeIn
+
+        Ubuntu.UbuntuNumberAnimation {
+            id: currentImageFadeOut
+            target: fadeStyle == "cross" ? internals.currentImage : fadeOutDummy
+            property: "opacity"
+            to: 0.0
+            duration: crossFadeImage.fadeDuration
+        }
+
+        Ubuntu.UbuntuNumberAnimation {
+            target: internals.nextImage
+            property: "opacity"
+            to: 1.0
+            duration: crossFadeImage.fadeDuration
+        }
+
+        onRunningChanged: {
+            if (!running) {
+                internals.nextImage.source = "";
+            }
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/DraggingArea.qml'
--- modules/Ubuntu/Components/1.2/DraggingArea.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/DraggingArea.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2013 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 "mathUtils.js" as MathLocal
+
+MouseArea {
+    id: draggingArea
+
+    property int orientation: Qt.Vertical
+    property bool dragging
+    property real dragVelocity: 0
+    property real dragValue: (orientation == Qt.Vertical ? (mouseY - __pressedPosition.y)
+                                                            : (mouseX - __pressedPosition.x))
+    property real lateralPosition: orientation == Qt.Horizontal ? MathLocal.clamp(mouseY, 0, height) : MathLocal.clamp(mouseX, 0, width)
+    property point __pressedPosition: Qt.point(0, 0)
+    property var __dragEvents: []
+    property bool clickValidated: true
+    property bool zeroVelocityCounts: false
+
+
+    signal dragStart
+    signal dragEnd
+
+    onDragValueChanged: {
+        if (dragValue != 0 && pressed) {
+            dragging = true
+        }
+    }
+
+    onDraggingChanged: {
+        if (dragging) {
+            dragStart()
+        }
+        else {
+            dragEnd()
+        }
+    }
+
+    function updateSpeed() {
+        var totalSpeed = 0
+        for (var i=0; i<__dragEvents.length; i++) {
+            totalSpeed += __dragEvents[i][3]
+        }
+
+        if (zeroVelocityCounts || Math.abs(totalSpeed) > 0.001) {
+            dragVelocity = totalSpeed / __dragEvents.length * 1000
+        }
+    }
+
+    function cullOldDragEvents(currentTime) {
+        // cull events older than 50 ms but always keep the latest 2 events
+        for (var numberOfCulledEvents=0; numberOfCulledEvents<__dragEvents.length-2; numberOfCulledEvents++) {
+            // __dragEvents[numberOfCulledEvents][0] is the dragTime
+            if (currentTime - __dragEvents[numberOfCulledEvents][0] <= 50) break
+        }
+
+        __dragEvents.splice(0, numberOfCulledEvents)
+    }
+
+    function getEventSpeed(currentTime, event) {
+        if (__dragEvents.length != 0) {
+            var lastDrag = __dragEvents[__dragEvents.length-1]
+            var duration = Math.max(1, currentTime - lastDrag[0])
+            if (orientation == Qt.Vertical) {
+                return (event.y - lastDrag[2]) / duration
+            } else {
+                return (event.x - lastDrag[1]) / duration
+            }
+        } else {
+            return 0
+        }
+    }
+
+    function pushDragEvent(event) {
+        var currentTime = new Date().getTime()
+        __dragEvents.push([currentTime, event.x, event.y, getEventSpeed(currentTime, event)])
+        cullOldDragEvents(currentTime)
+        updateSpeed()
+    }
+
+    onPositionChanged: {
+        if (dragging) {
+            pushDragEvent(mouse)
+        }
+        if (!draggingArea.containsMouse)
+            clickValidated = false
+    }
+
+    onPressed: {
+        __pressedPosition = Qt.point(mouse.x, mouse.y)
+        __dragEvents = []
+        pushDragEvent(mouse)
+        clickValidated = true
+    }
+
+    onReleased: {
+        dragging = false
+        __pressedPosition = Qt.point(mouse.x, mouse.y)
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/Header.qml'
--- modules/Ubuntu/Components/1.2/Header.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/Header.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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.4
+
+/*!
+    \qmltype Header
+    \internal
+    \deprecated
+*/
+AppHeader {
+
+    /*!
+      \internal
+      We need this property so QML exposes this class as Header instead of
+      AppHeader. This way autopilot can select the deprecated header.
+    */
+    property string _for_autopilot
+
+    Component.onCompleted: {
+        print("WARNING: Header is an internal component of Ubuntu.Components and" +
+              "its API may change or be removed at any moment." +
+              "Please use MainView and Page instead."
+              );
+    }
+}
 
=== renamed file 'modules/Ubuntu/Components/Icon10.qml' => 'modules/Ubuntu/Components/1.2/Icon10.qml'
=== renamed file 'modules/Ubuntu/Components/Icon11.qml' => 'modules/Ubuntu/Components/1.2/Icon11.qml'
=== added file 'modules/Ubuntu/Components/1.2/InputHandler.qml'
--- modules/Ubuntu/Components/1.2/InputHandler.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/InputHandler.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,518 @@
+/*
+ * 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.4
+import Ubuntu.Components 1.2
+
+/*
+  This component is a unified text selection and scrolling handler for both
+  TextField and TextArea components.
+  */
+
+MultiPointTouchArea {
+    id: inputHandler
+    objectName: "input_handler"
+
+    // the root control
+    property Item main
+    // the input instance
+    property Item input
+    // the Flickable holding the input instance
+    property Flickable flickable
+
+    // item filling the visible text input area used to check handler visibility
+    property Item visibleArea: Item {
+        parent: flickable
+        anchors.fill: parent
+    }
+
+    // line size and spacing
+    property real lineSpacing: units.dp(3)
+    property real lineSize: input.font.pixelSize + lineSpacing
+    // input x/y distance from the frame
+    property point frameDistance: Qt.point(flickable.x, flickable.y)
+
+    // signal triggered when popup should be opened
+    signal pressAndHold(int pos, bool fromTouch)
+    signal tap(int pos)
+    property string oldText: ""
+    signal textModified()
+
+    function activateInput() {
+        if (!input.activeFocus) {
+            input.forceActiveFocus();
+        }
+        showInputPanel();
+    }
+
+    function showInputPanel() {
+        if (!Qt.inputMethod.visible) {
+            Qt.inputMethod.show();
+        }
+        textChanged = false;
+    }
+    function hideInputPanel() {
+        Qt.inputMethod.hide();
+        // emit accepted signal if changed
+        if (textChanged && input.hasOwnProperty("accepted")) {
+            input.accepted();
+        }
+    }
+
+    // internal properties/functions
+    readonly property bool singleLine: input.hasOwnProperty("validator")
+    property var flickableList: new Array()
+    property bool textChanged: false
+    property var popover
+    property bool suppressReleaseEvent: false
+    property int pressedPosition: -1
+    // move properties
+    property int moveStarts: -1
+    property int moveEnds: -1
+    // set scroller to the first Flickable that scrolls the input
+    // this can be the internal Flickable if the full autosize is disabled
+    // or one of the input's parent Flickable
+    readonly property bool scrollingDisabled: main && main.hasOwnProperty("autoSize") ?
+                                                  (main.autoSize && (main.maximumLineCount <= 0)) : false
+    onScrollingDisabledChanged: if (state == "") flickable.interactive = !scrollingDisabled
+    readonly property Flickable grandScroller: firstFlickableParent(main)
+    readonly property Flickable scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
+
+    // ensures the text cursorRectangle is always in the internal Flickable's visible area
+    function ensureVisible(rect)
+    {
+        if (flickable.moving || flickable.flicking)
+            return;
+        if (flickable.contentX >= rect.x)
+            flickable.contentX = rect.x;
+        else if (flickable.contentX + flickable.width <= rect.x + rect.width)
+            flickable.contentX = rect.x + rect.width - flickable.width;
+        if (flickable.contentY >= rect.y)
+            flickable.contentY = rect.y;
+        else if (flickable.contentY + flickable.height <= rect.y + rect.height)
+            flickable.contentY = rect.y + rect.height - flickable.height;
+    }
+    // returns the cursor position from x,y pair
+    function unadulteratedCursorPosition(x, y) {
+        return singleLine ? input.positionAt(x, TextInput.CursorOnCharacter) : input.positionAt(x, y, TextInput.CursorOnCharacter);
+    }
+    // returns the cursor position taking frame into account
+    function cursorPosition(x, y) {
+        var frameSpacing = main.__styleInstance.frameSpacing;
+        var cursorPosition = unadulteratedCursorPosition(x, y);
+        if (cursorPosition == 0)
+            cursorPosition = unadulteratedCursorPosition(x + frameSpacing, y + frameSpacing);
+        if (cursorPosition == text.length)
+            cursorPosition = unadulteratedCursorPosition(x - frameSpacing, y - frameSpacing);
+        return cursorPosition
+    }
+
+    // returns the mouse position
+    function mousePosition(mouse) {
+        return cursorPosition(mouse.x, mouse.y);
+    }
+    // checks whether the position is in the selected text
+    function positionInSelection(pos) {
+        return (input.selectionStart !== input.selectionEnd)
+                && (pos >= Math.min(input.selectionStart, input.selectionEnd))
+                && (pos <= Math.max(input.selectionStart, input.selectionEnd));
+    }
+
+    // check whether the mouse is inside a selected text area
+    function mouseInSelection(mouse) {
+        var pos = mousePosition(mouse);
+        return positionInSelection(pos);
+    }
+    // selects text
+    function selectText(mouse) {
+        state = "select";
+        moveEnds = mousePosition(mouse);
+        if (moveStarts < 0) {
+            moveStarts = moveEnds;
+        }
+        input.select(moveStarts, moveEnds);
+    }
+    // returns the first Flickable parent of a given item
+    function firstFlickableParent(item) {
+        var p = item ? item.parent : null;
+        while (p && !p.hasOwnProperty("flicking")) {
+            p = p.parent;
+        }
+        return p;
+    }
+    // focuses the input if not yet focused, and shows the context menu
+    function openContextMenu(mouse, noAutoselect, fromTouch) {
+        var pos = mousePosition(mouse);
+        if (!main.focus || !mouseInSelection(mouse)) {
+            activateInput();
+            input.cursorPosition = pressedPosition = mousePosition(mouse);
+            if (!noAutoselect) {
+                input.selectWord();
+            }
+        }
+        // open context menu at the cursor position
+        inputHandler.pressAndHold(input.cursorPosition, fromTouch);
+        // if opened with left press (touch falls into this criteria as well), we need to set state to inactive
+        // so the mouse moves won't result in selected text loss/change
+        if (mouse.button === Qt.LeftButton) {
+            state = "inactive";
+        }
+    }
+
+    // disables interactive Flickable parents, stops at the first non-interactive flickable.
+    function toggleFlickablesInteractive(turnOn) {
+        var p;
+        if (!turnOn) {
+            // handle the scroller separately
+            p = firstFlickableParent(scroller)
+            while (p) {
+                if (p.interactive) {
+                    flickableList.push(p);
+                    p.interactive = false;
+                } else {
+                    break;
+                }
+                p = firstFlickableParent(p);
+            }
+        } else {
+            while (flickableList.length > 0) {
+                p = flickableList.pop();
+                p.interactive = true;
+            }
+        }
+    }
+
+    // moves the specified position, called by the cursor handler
+    // positioner = "currentPosition/selectionStart/selectionEnd"
+    function positionCaret(positioner, x, y) {
+        if (positioner === "cursorPosition") {
+            input[positioner] = cursorPosition(x, y);
+        } else {
+            var pos = cursorPosition(x, y);
+            if (positioner === "selectionStart" && (pos < input.selectionEnd)) {
+                input.select(pos, input.selectionEnd);
+            } else if (positioner === "selectionEnd" && (pos > input.selectionStart)) {
+                input.select(input.selectionStart, pos);
+            }
+        }
+    }
+
+    // moves the cursor one page forward with or without positioning the cursor
+    function movePage(forward) {
+        var cx = input.cursorRectangle.x;
+        var cy = input.cursorRectangle.y;
+        if (forward) {
+            if (singleLine) {
+                cx += visibleArea.width;
+            } else {
+                cy += visibleArea.height;
+            }
+        } else {
+            if (singleLine) {
+                cx -= visibleArea.width;
+            } else {
+                cy -= visibleArea.height;
+            }
+        }
+        input.cursorPosition = cursorPosition(cx, cy);
+    }
+
+    Component.onCompleted: {
+        state = (main.focus) ? "" : "inactive";
+        // FIXME: Qt5.3 related! mouseEnabled is a 5.3 related property which has a positive
+        // default value. That value messes up teh current understanding (5.2) of the
+        // MultiPointTouchArea functioning. We need to set it to false until 5.3 will be the
+        // default supported Qt version, when we can have a clean property value assignment
+        if (inputHandler.hasOwnProperty("mouseEnabled")) {
+            inputHandler.mouseEnabled = false;
+        }
+    }
+
+    // states
+    states: [
+        // override default state to turn on the saved Flickable interactive mode
+        State {
+            name: ""
+            StateChangeScript {
+                // restore interactive for all Flickable parents
+                script: toggleFlickablesInteractive(true);
+            }
+        },
+        State {
+            name: "inactive"
+            // we do not disable scroller here as in case the internal scrolling
+            // is disabled (scrollingDisabled = true) the outer scroller (grandScroller)
+            // would be blocked as well, which we don't want to
+            PropertyChanges {
+                target: flickable
+                interactive: false
+            }
+        },
+        State {
+            name: "scrolling"
+            StateChangeScript {
+                script: {
+                    // stop scrolling all the parents
+                    toggleFlickablesInteractive(false);
+                    // stop touch timers
+                    touchPoint.reset();
+                }
+            }
+        },
+        State {
+            name: "select"
+            // during select state all the flickables are blocked (interactive = false)
+            // we can use scroller here as we need to disable the outer scroller too!
+            PropertyChanges {
+                target: scroller
+                interactive: false
+            }
+            StateChangeScript {
+                script: {
+                    // turn off interactive for all parent flickables
+                    toggleFlickablesInteractive(false);
+                    if (!positionInSelection(pressedPosition)) {
+                        input.cursorPosition = pressedPosition;
+                    }
+                }
+            }
+        }
+    ]
+
+    // brings the state back to default when the component looses focuse
+    Connections {
+        target: main
+        ignoreUnknownSignals: true
+        onFocusChanged: {
+            Qt.inputMethod.commit()
+            state = (main.focus) ? "" : "inactive";
+        }
+    }
+
+    // input specific signals
+    Connections {
+        target: input
+        onCursorRectangleChanged: ensureVisible(input.cursorRectangle)
+        onTextChanged: {
+            textChanged = true;
+            if (oldText != input.text) {
+                textModified()
+                oldText = text
+            }
+        }
+        // make sure we show the OSK
+        onActiveFocusChanged: showInputPanel()
+    }
+
+    // inner or outer Flickable controlling
+    Connections {
+        target: scroller
+        // turn scrolling state on
+        onFlickStarted: toggleScrollingState(true)
+        onMovementStarted: toggleScrollingState(true)
+        // reset to default state
+        onMovementEnded: toggleScrollingState(false)
+
+        function toggleScrollingState(turnOn) {
+            if (!main.focus) {
+                return;
+            }
+            inputHandler.state = (turnOn) ? "scrolling" : ""
+        }
+    }
+
+    // PageUp and PageDown handling
+    Keys.onPressed: {
+        if (event.key === Qt.Key_PageUp && event.modifiers === Qt.NoModifier) {
+            movePage(false);
+        } else if (event.key === Qt.Key_PageDown && event.modifiers === Qt.NoModifier) {
+            movePage(true);
+        }
+    }
+
+    // touch and mous handling
+    function handlePressed(event, touch) {
+        if (touch) {
+            // we do not have longTap or double tap, therefore we need to generate those
+            event.touch();
+        } else {
+            // consume event so it does not get forwarded to the input
+            event.accepted = true;
+        }
+        // remember pressed position as we need it when entering into selection state
+        pressedPosition = mousePosition(event);
+    }
+    function handleReleased(event, touch) {
+        if (touch) {
+            event.untouch();
+        }
+        if ((!main.focus && !main.activeFocusOnPress) || suppressReleaseEvent === true) {
+            suppressReleaseEvent = false;
+            return;
+        }
+
+        activateInput();
+        if (state === "" || touch) {
+            input.cursorPosition = mousePosition(event);
+        }
+        moveStarts = moveEnds = -1;
+        state = "";
+        // check if we get right-click from the frame or the area that has no text
+        if (event.button === Qt.RightButton) {
+            // open the popover
+            inputHandler.pressAndHold(input.cursorPosition, touch);
+        } else {
+            inputHandler.tap(input.cursorPosition);
+        }
+    }
+    function handleMove(event, touch ) {
+        // leave if not focus, not the left button or not in select state
+        if (!input.activeFocus || (!touch && event.button !== Qt.LeftButton) || !main.selectByMouse) {
+            return;
+        }
+        selectText(event);
+    }
+    function handleDblClick(event, touch) {
+        if (main.selectByMouse) {
+            openContextMenu(event, false, touch);
+            // turn selection state temporarily so the selection is not cleared on release
+            state = "selection";
+            suppressReleaseEvent = true;
+        }
+    }
+
+    // Mouse handling
+    Mouse.forwardTo: [main]
+    Mouse.onPressed: handlePressed(mouse, false)
+    Mouse.onReleased: handleReleased(mouse, false)
+    Mouse.onPositionChanged: handleMove(mouse, false)
+    Mouse.onDoubleClicked: handleDblClick(mouse, false)
+
+    // right button handling
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        // trigger pressAndHold
+        onReleased: openContextMenu(mouse, true, false)
+    }
+    Keys.onMenuPressed: inputHandler.pressAndHold(input.cursorPosition, false);
+
+    // touch handling
+    touchPoints: TouchPoint {
+        id: touchPoint
+        function touch() {
+            longTap.restart();
+            if (!doubleTap.running) {
+                doubleTap.restart();
+            } else if (doubleTap.tapCount > 0) {
+                doubleTap.running = false;
+                handleDblClick(touchPoint, true);
+            }
+        }
+        function untouch() {
+            longTap.running = false;
+        }
+        function reset() {
+            longTap.running = false;
+            doubleTap.running = false;
+        }
+    }
+    Timer {
+        id: longTap
+        // sync with QQuickMouseArea constant
+        interval: 800
+        onTriggered: {
+            // do not open context menu if the input is not focus
+            if (!main.focus) {
+                return;
+            }
+
+            // do not open context menu if this is scrolling
+            if (touchPoint.startY - touchPoint.y < -units.gu(2))
+                return;
+
+            openContextMenu(touchPoint, false, true);
+            suppressReleaseEvent = true;
+        }
+    }
+
+    property bool doubleTapInProgress: doubleTap.running
+    Timer {
+        id: doubleTap
+        property int tapCount: 0
+        interval: 400
+        onRunningChanged: {
+            tapCount = running;
+        }
+    }
+    onPressed: handlePressed(touchPoints[0], true)
+    onReleased: handleReleased(touchPoints[0], true)
+
+    property Item cursorPositionCursor: null
+    property Item selectionStartCursor: null
+    property Item selectionEndCursor: null
+
+    // cursors to use when text is selected
+    Connections {
+        target: input
+        onSelectedTextChanged: {
+            if (selectedText !== "") {
+                if (!selectionStartCursor) {
+                    selectionStartCursor = input.cursorDelegate.createObject(
+                                input, {
+                                    "positionProperty": "selectionStart",
+                                    "handler": inputHandler,
+                                    }
+                                );
+                    moveSelectionCursor(selectionStartCursor);
+                    selectionEndCursor = input.cursorDelegate.createObject(
+                                input, {
+                                    "positionProperty": "selectionEnd",
+                                    "handler": inputHandler,
+                                    }
+                                );
+                    moveSelectionCursor(selectionEndCursor);
+                }
+            } else {
+                if (selectionStartCursor) {
+                    selectionStartCursor.destroy();
+                    selectionStartCursor = null;
+                    selectionEndCursor.destroy();
+                    selectionEndCursor = null;
+                }
+            }
+        }
+        onSelectionStartChanged: moveSelectionCursor(selectionStartCursor, true);
+        onSelectionEndChanged: moveSelectionCursor(selectionEndCursor, true);
+
+        function moveSelectionCursor(cursor, updateProperty) {
+            if (!cursor) {
+                return;
+            }
+            // workaround for https://bugreports.qt-project.org/browse/QTBUG-38704
+            // selectedTextChanged signal is not emitted for TextEdit when selectByMouse is false
+            if (updateProperty && QuickUtils.className(input) === "QQuickTextEdit") {
+                input.selectedTextChanged();
+            }
+
+            var pos = input.positionToRectangle(input[cursor.positionProperty]);
+            cursor.x = pos.x;
+            cursor.y = pos.y;
+            cursor.height = pos.height;
+            ensureVisible(pos);
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/Label.qml'
--- modules/Ubuntu/Components/1.2/Label.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/Label.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012 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
+
+/*!
+    \qmltype Label
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Text with Ubuntu styling.
+
+    Example:
+    \qml
+    Rectangle {
+        color: UbuntuColors.coolGrey
+        width: units.gu(30)
+        height: units.gu(30)
+
+        Label {
+            anchors.centerIn: parent
+            text: "Hello, world!"
+            fontSize: "large"
+        }
+    }
+    \endqml
+*/
+Text {
+    id: label
+
+    /*!
+      The size of the text. One of the following strings (from smallest to largest):
+        \list
+          \li "xx-small"
+          \li "x-small"
+          \li "small"
+          \li "medium"
+          \li "large"
+          \li "x-large"
+        \endlist
+        Default value is "medium".
+      */
+    property string fontSize: "medium"
+
+    font.pixelSize: FontUtils.sizeToPixels(fontSize)
+    color: Theme.palette.selected.backgroundText
+}
 
=== renamed file 'modules/Ubuntu/Components/MainView.qml' => 'modules/Ubuntu/Components/1.2/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-04-28 06:32:00 +0000
+++ modules/Ubuntu/Components/1.2/MainView.qml	2015-05-06 10:32:32 +0000
@@ -136,7 +136,7 @@
             flickable: internal.activePage ? internal.activePage.flickable : null
             pageStack: internal.activePage ? internal.activePage.pageStack : null
 
-            PageHeadConfiguration11 {
+            PageHeadConfiguration {
                 id: headerConfig
                 // for backwards compatibility with deprecated tools property
                 actions: internal.activePage ?
 
=== added file 'modules/Ubuntu/Components/1.2/MainView12.qml'
--- modules/Ubuntu/Components/1.2/MainView12.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/MainView12.qml	2015-05-06 10:32:32 +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 PageTreeNode 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")
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/MainViewBase.qml'
--- modules/Ubuntu/Components/1.2/MainViewBase.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/MainViewBase.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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.0
+
+/*! \internal */
+// Documentation is in MainView.qdoc
+PageTreeNode {
+    id: mainView
+    property string applicationName: ""
+    property bool anchorToKeyboard: false
+    property alias headerColor: background.headerColor
+    property alias backgroundColor: background.backgroundColor
+    property alias footerColor: background.footerColor
+
+    // FIXME: Make sure that the theming is only in the background, and the style
+    //  should not occlude contents of the MainView. When making changes here, make
+    //  sure that bug https://bugs.launchpad.net/manhattan/+bug/1124076 does not come back.
+    Toolkit.StyledItem {
+        id: background
+        anchors.fill: parent
+        style: Theme.createStyleComponent("MainViewStyle.qml", background)
+
+        property color headerColor: backgroundColor
+        property color backgroundColor: Theme.palette.normal.background
+        property color footerColor: backgroundColor
+
+        /*
+          As we don't know the order the property bindings and onXXXChanged signals are evaluated
+          we should rely only on one property when changing the theme to avoid intermediate
+          theme changes due to properties being evaluated separately.
+
+          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
+         */
+        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+                                   "Ambiance" : "SuruDark"
+        onThemeChanged: {
+            // only change the theme if the current one is a system one.
+            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
+                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
+            }
+        }
+    }
+
+    active: true
+    property alias actions: unityActionManager.actions
+    property alias actionManager: unityActionManager
+    Toolkit.ActionManager {
+        id: unityActionManager
+        onQuit: {
+            // FIXME Wire this up to the application lifecycle management API instead of quit().
+            Qt.quit()
+        }
+    }
+
+    onApplicationNameChanged: {
+        if (applicationName !== "") {
+            i18n.domain = applicationName;
+            UbuntuApplication.applicationName = applicationName
+        }
+    }
+
+    PerformanceOverlay {
+        id: performanceOverlay
+        active: false
+    }
+}
 
=== renamed file 'modules/Ubuntu/Components/Object.qml' => 'modules/Ubuntu/Components/1.2/Object.qml'
=== added file 'modules/Ubuntu/Components/1.2/OptionSelector.qml'
--- modules/Ubuntu/Components/1.2/OptionSelector.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/OptionSelector.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2012 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.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.2 as Toolkit
+
+/*!
+    \qmltype OptionSelector
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu-components
+    \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
+    listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
+
+    Examples:
+    \qml
+        import Ubuntu.Components 1.2
+        Column {
+            spacing: units.gu(3)
+
+            OptionSelector {
+                text: i18n.tr("Label")
+                model: [i18n.tr("Value 1"),
+                        i18n.tr("Value 2"),
+                        i18n.tr("Value 3"),
+                        i18n.tr("Value 4")]
+            }
+
+            OptionSelector {
+                text: i18n.tr("Label")
+                expanded: true
+                model: [i18n.tr("Value 1"),
+                        i18n.tr("Value 2"),
+                        i18n.tr("Value 3"),
+                        i18n.tr("Value 4")]
+            }
+
+            OptionSelector {
+                objectName: "optionselector_multipleselection"
+                text: i18n.tr("Multiple Selection")
+                expanded: false
+                multiSelection: true
+                model: [i18n.tr("Value 1"),
+                        i18n.tr("Value 2"),
+                        i18n.tr("Value 3"),
+                        i18n.tr("Value 4")]
+            }
+
+            OptionSelector {
+                text: i18n.tr("Label")
+                model: customModel
+                expanded: true
+                colourImage: true
+                delegate: selectorDelegate
+            }
+
+            Component {
+                id: selectorDelegate
+                OptionSelectorDelegate { text: name; subText: description; iconSource: image }
+            }
+
+            ListModel {
+                id: customModel
+                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png" }
+                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png" }
+                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png" }
+                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png" }
+            }
+
+            OptionSelector {
+                text: i18n.tr("Label")
+                model: [i18n.tr("Value 1"),
+                        i18n.tr("Value 2"),
+                        i18n.tr("Value 3"),
+                        i18n.tr("Value 4"),
+                        i18n.tr("Value 5"),
+                        i18n.tr("Value 6"),
+                        i18n.tr("Value 7"),
+                        i18n.tr("Value 8")]
+                containerHeight: itemHeight * 4
+            }
+
+            OptionSelector {
+                text: i18n.tr("Label")
+                expanded: true
+                model: [i18n.tr("Value 1"),
+                        i18n.tr("Value 2"),
+                        i18n.tr("Value 3"),
+                        i18n.tr("Value 4"),
+                        i18n.tr("Value 5"),
+                        i18n.tr("Value 6"),
+                        i18n.tr("Value 7"),
+                        i18n.tr("Value 8")]
+                containerHeight: itemHeight * 4
+            }
+        }
+    \endqml
+*/
+
+ListItem.Empty {
+    id: optionSelector
+
+    /*!
+      The list of values that will be shown under the label text. This is a model.
+     */
+    property var model
+
+    /*!
+      Specifies whether the list is always expanded.
+     */
+    property bool expanded: false
+
+    /*!
+      If the multiple choice selection is enabled the list is always expanded.
+     */
+    property bool multiSelection: false
+
+    /*!
+      Colours image according to the fieldText colour of the theme, otherwise source colour is maintained.
+     */
+    property bool colourImage: false
+
+    /*!
+      ListView delegate.
+     */
+    property Component delegate: Toolkit.OptionSelectorDelegate {}
+
+    /*!
+      Custom height for list container which allows scrolling inside the selector.
+     */
+    property real containerHeight: {
+        /*The reason for this slightly unconventional method of setting the container height
+          is due to the fact that if we set it to the selector height by default (which is
+          bound to the colum height) then we wouldn't be able to scroll to the end of the bottom
+          boundary. The text is also invisible if none is set so this is taken into account too.*/
+        var textHeight = text === "" ? 0 : label.height + column.spacing;
+        if (parent && parent.height < list.contentHeight) {
+            return parent.height - textHeight;
+        } else {
+            list.contentHeight;
+        }
+    }
+
+    /*!
+      \qmlproperty int selectedIndex
+      The index of the currently selected element in our list.
+     */
+    property alias selectedIndex: list.currentIndex
+
+    /*!
+      \qmlproperty bool currentlyExpanded
+      Is our list currently expanded?
+     */
+    property alias currentlyExpanded: listContainer.currentlyExpanded
+
+    /*!
+      \qmlproperty real itemHeight
+      Height of an individual list item.
+     */
+    readonly property alias itemHeight: list.itemHeight
+
+    /*!
+      Called when delegate is clicked.
+     */
+    signal delegateClicked(int index)
+
+    /*!
+      Called when the selector has finished expanding or collapsing.
+     */
+    signal expansionCompleted()
+
+     /*!
+      \internal
+      Trigger the action, passing the current index.
+     */
+    onDelegateClicked: {
+        trigger(index)
+    }
+
+    __height: column.height
+    showDivider: false
+
+    Column {
+        id: column
+
+        spacing: units.gu(2)
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Label {
+            id : label
+
+            text: optionSelector.text
+            visible: optionSelector.text !== "" ? true : false
+        }
+
+        Toolkit.StyledItem {
+            id: listContainer
+            objectName: "listContainer"
+            activeFocusOnPress: true
+
+            readonly property url chevron: __styleInstance.chevron
+            readonly property url tick: __styleInstance.tick
+            readonly property color themeColour: Theme.palette.selected.fieldText
+            readonly property alias colourImage: optionSelector.colourImage
+            property bool currentlyExpanded: expanded || multiSelection
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            state: optionSelector.expanded ? "expanded" : "collapsed"
+            style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
+            states: [ State {
+                    name: "expanded"
+                    when: listContainer.currentlyExpanded
+                    PropertyChanges {
+                        target: listContainer
+                        height: list.contentHeight < containerHeight ? list.contentHeight : containerHeight
+                    }
+                }, State {
+                    name: "collapsed"
+                    when: !listContainer.currentlyExpanded
+                    PropertyChanges {
+                        target: listContainer
+                        height: list.itemHeight
+                    }
+                }
+            ]
+
+            transitions: [ Transition {
+                    SequentialAnimation {
+                        Toolkit.UbuntuNumberAnimation {
+                            properties: "height"
+                            duration: Toolkit.UbuntuAnimation.BriskDuration
+                        }
+                        ScriptAction {
+                            script: {
+                                if (listContainer.currentlyExpanded) {
+                                    expansionCompleted();
+                                } else {
+                                    list.positionViewAtIndex(selectedIndex, ListView.Beginning);
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+
+            ListView {
+                id: list
+
+                property int previousIndex: -1
+                readonly property alias expanded: optionSelector.expanded
+                readonly property alias multiSelection: optionSelector.multiSelection
+                readonly property alias container: listContainer
+                property real itemHeight
+                signal delegateClicked(int index)
+
+                onMovementStarted: optionSelector.requestFocus(Qt.MouseFocusReason)
+                onFlickStarted: optionSelector.requestFocus(Qt.MouseFocusReason)
+                Toolkit.Mouse.onClicked: optionSelector.requestFocus(Qt.MouseFocusReason)
+
+                onDelegateClicked: optionSelector.delegateClicked(index);
+                interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
+                clip: true
+                currentIndex: 0
+                model: optionSelector.model
+                anchors.fill: parent
+
+                delegate: optionSelector.delegate
+
+                Behavior on contentY {
+                    Toolkit.UbuntuNumberAnimation {
+                        properties: "contentY"
+                        duration: Toolkit.UbuntuAnimation.BriskDuration
+                    }
+                }
+            }
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/1.2/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/1.2/OptionSelectorDelegate.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/1.2/OptionSelectorDelegate.qml	2015-05-06 10:32:32 +0000
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2012 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/>.
+ */
+
+/*!
+    \qmltype OptionSelectorDelegate
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu-components
+    \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
+
+    Examples:
+    \qml
+        import Ubuntu.Components 1.2
+        Column {
+            width: 250
+            OptionSelector {
+                text: i18n.tr("Label")
+                model: customModel
+                delegate: OptionSelectorDelegate { text: name; subText: description; iconSource: image }
+            }
+            ListModel {
+                id: customModel
+                ListElement { name: "Name 1"; description: "Description 1"; image: "images.png" }
+                ListElement { name: "Name 2"; description: "Description 2"; image: "images.png" }
+                ListElement { name: "Name 3"; description: "Description 3"; image: "images.png" }
+                ListElement { name: "Name 4"; description: "Description 4"; image: "images.png" }
+            }
+        }
+    \endqml
+*/
+
+import QtQuick 2.4
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.2 as Toolkit
+
+ListItem.Empty {
+    id: option
+
+    __height: units.gu(5)
+
+    /*!
+      Subtext which appears below the main text.
+     */
+    property string subText
+
+    /*!
+      \deprecated
+
+      \b{Use iconName or iconSource instead.}
+
+      Left icon url.
+     */
+    property url icon: iconSource
+    onIconChanged: if (icon != iconSource) {
+                       console.warn("WARNING: OptionSelectorDelegate.icon is DEPRECATED. " +
+                                     "Use iconName and iconSource instead.")
+                   }
+
+    /*!
+      Constrains the size of the image to nothing greater than that of the delegate. Changes fillMode to Image.PreserveAspectFit.
+     */
+    property bool constrainImage: false
+
+    /*!
+      Whether or not left image is coloured by our theme.
+     */
+    property bool colourImage: listView.container.colourImage
+
+    /*!
+      Colour of left image.
+     */
+    property color assetColour: listView.container.themeColour
+
+    /*!
+      OptionSelector's ListView.
+     */
+    readonly property ListView listView: ListView.view
+
+    /*!
+      Colourising fragment shader.
+     */
+    readonly property string fragColourShader:
+        "varying highp vec2 qt_TexCoord0;
+         uniform sampler2D source;
+         uniform lowp vec4 colour;
+         uniform lowp float qt_Opacity;
+
+         void main() {
+            lowp vec4 sourceColour = texture2D(source, qt_TexCoord0);
+            gl_FragColor = colour * sourceColour.a * qt_Opacity;
+        }"
+
+    showDivider: index !== listView.count - 1 ? 1 : 0
+    highlightWhenPressed: false
+    selected: ListView.isCurrentItem
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    onClicked: {
+        if (listView.container.currentlyExpanded) {
+            listView.delegateClicked(index);
+
+            if (!listView.multiSelection) {
+                listView.previousIndex = listView.currentIndex;
+                listView.currentIndex = index;
+            } else {
+                selected = !selected;
+            }
+        }
+
+        if (!listView.expanded && !listView.multiSelection) {
+            listView.container.currentlyExpanded = !listView.container.currentlyExpanded;
+        }
+    }
+
+    Component.onCompleted: {
+        height = listView.itemHeight = childrenRect.height;
+    }
+
+    //Since we don't want to add states to our divider, we use the exposed alias provided in Empty to access it and alter it's opacity from here.
+    states: [ State {
+            name: "dividerExpanded"
+            when: listView.container.state === "expanded" && index === listView.currentIndex
+            PropertyChanges {
+                target: option.divider
+                opacity: 1
+            }
+        }, State {
+            name: "dividerCollapsed"
+            when: listView.container.state === "collapsed" && index === listView.currentIndex
+            PropertyChanges {
+                target: option.divider
+                opacity: 0
+            }
+        }
+    ]
+
+    //As with our states, we apply the transition with our divider as the target.
+    transitions: [ Transition {
+            from: "dividerExpanded"
+            to: "dividerCollapsed"
+            Toolkit.UbuntuNumberAnimation {
+                target: option.divider
+                properties: "opacity"
+                duration: Toolkit.UbuntuAnimation.SlowDuration
+            }
+        }
+    ]
+
+    resources: [
+        Connections {
+            target: listView.container
+            onCurrentlyExpandedChanged: {
+                imageExpansion.stop();
+                selectedImageCollapse.stop();
+                deselectedImageCollapse.stop();
+
+                if (listView.container.currentlyExpanded === true) {
+                    if (!option.selected) {
+                        optionExpansion.start();
+
+                        //Ensure a source change. This solves a bug which happens occasionaly when source is switched correctly. Probably related to the image.source binding.
+                        image.source = listView.container.tick
+                    } else {
+                        imageExpansion.start();
+                    }
+                } else {
+                    if (!option.selected) {
+                        optionCollapse.start();
+                    } else {
+                        if (listView.previousIndex !== listView.currentIndex)
+                            selectedImageCollapse.start();
+                        else {
+                            deselectedImageCollapse.start();
+                        }
+                    }
+                }
+            }
+        }, SequentialAnimation {
+            id: imageExpansion
+
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 1.0
+                to: 0.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+            PauseAnimation { duration: Toolkit.UbuntuAnimation.BriskDuration - Toolkit.UbuntuAnimation.FastDuration }
+            PropertyAction {
+                target: image
+                property: "source"
+                value: listView.container.tick
+            }
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 0.0
+                to: 1.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+        }, PropertyAnimation {
+            id: optionExpansion
+
+            target: option
+            properties: "opacity"
+            from : 0.0
+            to: 1.0
+            duration: Toolkit.UbuntuAnimation.SlowDuration
+        }, SequentialAnimation {
+            id: deselectedImageCollapse
+
+            PauseAnimation { duration: Toolkit.UbuntuAnimation.BriskDuration }
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 1.0
+                to: 0.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+            PauseAnimation { duration: Toolkit.UbuntuAnimation.FastDuration }
+            PropertyAction {
+                target: image
+                property: "source"
+                value: listView.container.chevron
+            }
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 0.0
+                to: 1.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+        }, SequentialAnimation {
+            id: selectedImageCollapse
+
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 0.0
+                to: 1.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+            PauseAnimation { duration: Toolkit.UbuntuAnimation.BriskDuration - Toolkit.UbuntuAnimation.FastDuration }
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 1.0
+                to: 0.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+            PauseAnimation { duration: Toolkit.UbuntuAnimation.FastDuration }
+            PropertyAction {
+                target: image
+                property: "source"
+                value: listView.container.chevron
+            }
+            PropertyAnimation {
+                target: image
+                properties: "opacity"
+                from : 0.0
+                to: 1.0
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+        }, PropertyAnimation {
+                id: optionCollapse
+                target: option
+                properties: "opacity"
+                from : 1.0
+                to: 0.0
+                duration: Toolkit.UbuntuAnimation.SlowDuration
+        }
+    ]
+
+    Row {
+        spacing: units.gu(1)
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+
+        Image {
+            id: leftIcon
+            objectName: "icon"
+
+            height: constrainImage ? option.height : sourceSize.height
+            source: option.iconSource
+            fillMode: constrainImage ? Image.PreserveAspectFit : Image.Stretch
+
+            ShaderEffect {
+                property color colour: assetColour
+                property Image source: parent
+
+                width: source.width
+                height: source.height
+                visible: colourImage
+
+                fragmentShader: fragColourShader
+             }
+        }
+
+        Column {
+            anchors {
+                verticalCenter: parent.verticalCenter
+            }
+            Label {
+                text: option.text === "" ? modelData : option.text
+            }
+            Label {
+                text: option.subText
+                visible: option.subText !== "" ? true : false
+                fontSize: "small"
+            }
+        }
+    }
+
+    Image {
+        id: image
+
+        width: units.gu(2)
+        height: units.gu(2)
+        source: listView.expanded || listView.multiSelection ? listView.container.tick : listView.container.chevron
+        opacity: option.selected ? 1.0 : 0.0
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+
+        //Our behaviour is only enabled for our expanded list due to flickering bugs in relation to all this other animations running on the expanding version.
+        Behavior on opacity {
+            enabled: listView.expanded
+
+            Toolkit.UbuntuNumberAnimation {
+                properties: "opacity"
+                duration: Toolkit.UbuntuAnimation.FastDuration
+            }
+        }
+
+        ShaderEffect {
+            property color colour: assetColour
+            property Image source: parent
+
+            width: source.width
+            height: source.height
+
+            fragmentShader: fragColourShader