Merge lp:~zsombi/ubuntu-ui-toolkit/toolkit-version into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Moving to import version 1.0, which is the same as version 0.1.

[lp:~zsombi/ubuntu-ui-toolkit/toolkit-version]

1012. By Zsombor Egri on 2014-04-23

CHANGES file updated

1013. By Zsombor Egri on 2014-04-23

named import removed as 1.0 version does not have problems with QTBUG-27645

1014. By Zsombor Egri on 2014-04-23

gallery rolled back to import 0.1 to make sure we do not break anything

[Tim Peeters (tpeeters)]

looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1011
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4972
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4576/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5147
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5147/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4607
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5178
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5178/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'CHANGES'
--- CHANGES	2014-04-16 11:51:47 +0000
+++ CHANGES	2014-04-23 09:21:19 +0000
@@ -9,6 +9,7 @@
 
 API Changes
 ***********
+* ADDED IN: all modules exported as 0.1 as well as 1.0 version
 * ADDED IN: PickerDelegate: readonly property Picker picker
 * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
 * CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
 
=== modified file 'components.api'
--- components.api	2014-04-16 11:51:47 +0000
+++ components.api	2014-04-23 09:21:19 +0000
@@ -6,32 +6,69 @@
     property bool hovered
     property bool __acceptEvents
     property internal __mouseArea
-modules/Ubuntu/Components/Action.qml
-UnityActions.Action
-    property url iconSource
-    property string iconName
-    property bool visible
-    property Component itemHint
-modules/Ubuntu/Components/ActionItem.qml
-StyledItem
-    property Action action
-    property string text
-    property url iconSource
-    property string iconName
-    signal triggered(var value)
-    function trigger(value)
-modules/Ubuntu/Components/ActionList.qml
-QtObject
-    default property list<Action> children
-    property list<Action> actions
-modules/Ubuntu/Components/ActivityIndicator.qml
-AnimatedItem
-    property bool running
-modules/Ubuntu/Components/Button.qml
-AbstractButton
-    property color color
-    property Gradient gradient
-    property string iconPosition
+modules/Ubuntu/Components/AbstractButton.qml
+ActionItem
+    signal clicked()
+    signal pressAndHold()
+    property bool pressed
+    property bool hovered
+    property bool __acceptEvents
+    property internal __mouseArea
+modules/Ubuntu/Components/Action.qml
+UnityActions.Action
+    property url iconSource
+    property string iconName
+    property bool visible
+    property Component itemHint
+modules/Ubuntu/Components/Action.qml
+UnityActions.Action
+    property url iconSource
+    property string iconName
+    property bool visible
+    property Component itemHint
+modules/Ubuntu/Components/ActionItem.qml
+StyledItem
+    property Action action
+    property string text
+    property url iconSource
+    property string iconName
+    signal triggered(var value)
+    function trigger(value)
+modules/Ubuntu/Components/ActionItem.qml
+StyledItem
+    property Action action
+    property string text
+    property url iconSource
+    property string iconName
+    signal triggered(var value)
+    function trigger(value)
+modules/Ubuntu/Components/ActionList.qml
+QtObject
+    default property list<Action> children
+    property list<Action> actions
+modules/Ubuntu/Components/ActionList.qml
+QtObject
+    default property list<Action> children
+    property list<Action> actions
+modules/Ubuntu/Components/ActivityIndicator.qml
+AnimatedItem
+    property bool running
+modules/Ubuntu/Components/ActivityIndicator.qml
+AnimatedItem
+    property bool running
+modules/Ubuntu/Components/Button.qml
+AbstractButton
+    property color color
+    property Gradient gradient
+    property string iconPosition
+modules/Ubuntu/Components/Button.qml
+AbstractButton
+    property color color
+    property Gradient gradient
+    property string iconPosition
+modules/Ubuntu/Components/CheckBox.qml
+AbstractButton
+    property bool checked
 modules/Ubuntu/Components/CheckBox.qml
 AbstractButton
     property bool checked
@@ -53,255 +90,515 @@
     readonly property bool running
     property size sourceSize
     readonly property int status
-modules/Ubuntu/Components/Header.qml
-StyledItem
-    property bool animate
-    function show()
-    function hide()
-    property string title
-    property Item contents
-    property Flickable flickable
-modules/Ubuntu/Components/Icon.qml
-Item
-    property string name
-    property color color
-    property color keyColor
-modules/Ubuntu/Components/Label.qml
-Text
-    property string fontSize
-modules/Ubuntu/Components/ListItems/Base.qml
-Empty
-    property variant icon
-    property url iconSource
-    property string iconName
-    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
-    property internal children
-modules/Ubuntu/Components/ListItems/Caption.qml
-Item
-    property string text
-modules/Ubuntu/Components/ListItems/Divider.qml
-Image
-modules/Ubuntu/Components/ListItems/Empty.qml
-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()
-modules/Ubuntu/Components/ListItems/Expandable.qml
-Empty
-    property bool expanded
-    property real collapsedHeight
-    property real expandedHeight
-    property bool collapseOnClick
-    default property QtObject children
-modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml
-Flickable
-    readonly property Item expandedItem
-    function expandItem(item)
-    function collapse()
-    default property QtObject children
-modules/Ubuntu/Components/ListItems/Header.qml
-Item
-    property string text
-    property internal __foregroundColor
-modules/Ubuntu/Components/ListItems/ItemSelector.qml
-ListItem.Empty
-    property var model
-    property bool expanded
-    property bool multiSelection
-    property bool colourImage
-    property real containerHeight
-    property int selectedIndex
-    property bool currentlyExpanded
-    readonly property real itemHeight
-    signal delegateClicked(int index)
-    signal expansionCompleted()
-modules/Ubuntu/Components/ListItems/MultiValue.qml
-Base
-    property variant values
-modules/Ubuntu/Components/ListItems/SingleControl.qml
-Empty
-    property Item control
-    function __updateControl()
-modules/Ubuntu/Components/ListItems/SingleValue.qml
-Base
-    property string value
-modules/Ubuntu/Components/ListItems/Standard.qml
-Empty
-    property variant icon
-    property url iconSource
-    property string iconName
-    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
-modules/Ubuntu/Components/ListItems/Subtitled.qml
-Base
-    property string text
-    property string subText
-modules/Ubuntu/Components/ListItems/ThinDivider.qml
-Image
-modules/Ubuntu/Components/ListItems/ValueSelector.qml
-Empty
-    property variant icon
-    property url iconSource
-    property string iconName
-    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
-modules/Ubuntu/Components/MainView.qml
-PageTreeNode
-    property string applicationName
-    property bool anchorToKeyboard
-    property color headerColor
-    property color backgroundColor
-    property color footerColor
-    property bool automaticOrientation
-    property bool useDeprecatedToolbar
-    default property internal contentsItem
-    property list<Action> actions
-    property UnityActions.ActionManager actionManager
-modules/Ubuntu/Components/Object.qml
-QtObject
-    default property internal children
-modules/Ubuntu/Components/OptionSelector.qml
-ListItem.Empty
-    property var model
-    property bool expanded
-    property bool multiSelection
-    property bool colourImage
-    property real containerHeight
-    property int selectedIndex
-    property bool currentlyExpanded
-    readonly property real itemHeight
-    signal delegateClicked(int index)
-    signal expansionCompleted()
-modules/Ubuntu/Components/OptionSelectorDelegate.qml
-ListItem.Standard
-    property string text
-    property string subText
-    property url icon
-    property url iconSource
-    property string iconName
-    property bool constrainImage
-    property bool colourImage
-    property color assetColour
-    readonly property ListView listView
-    readonly property string fragColourShader
-modules/Ubuntu/Components/OrientationHelper.qml
-Item
-    property bool automaticOrientation
-    property bool transitionEnabled
-    property alias rotating
-    property int __orientationAngle
-    property int orientationAngle
-modules/Ubuntu/Components/Page.qml
-PageTreeNode
-    property string title
-    property Flickable flickable
-    property list<Action> actions
-modules/Ubuntu/Components/PageStack.qml
-PageTreeNode
-    property bool __showHeader
-    property int depth
-    property Item currentPage
-    function push(page, properties)
-    function pop()
-    function clear()
-modules/Ubuntu/Components/Panel.qml
-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
-modules/Ubuntu/Components/Pickers/DatePicker.qml
-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
-modules/Ubuntu/Components/Pickers/Dialer.qml
-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)
-modules/Ubuntu/Components/Pickers/DialerHand.qml
-StyledItem
-    property real value
-    property DialerHandGroup hand
-    readonly property Dialer dialer
-    default property list<QtObject> overlay
-    readonly property int index
-    property internal __grabber
-modules/Ubuntu/Components/Pickers/Picker.qml
-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
+modules/Ubuntu/Components/CrossFadeImage.qml
+Item
+    property url source
+    property int fillMode
+    property int fadeDuration
+    readonly property bool running
+    property size sourceSize
+    readonly property int status
+modules/Ubuntu/Components/Header.qml
+StyledItem
+    property bool animate
+    function show()
+    function hide()
+    property string title
+    property Item contents
+    property Flickable flickable
+modules/Ubuntu/Components/Header.qml
+StyledItem
+    property bool animate
+    function show()
+    function hide()
+    property string title
+    property Item contents
+    property Flickable flickable
+modules/Ubuntu/Components/Icon.qml
+Item
+    property string name
+    property color color
+    property color keyColor
+modules/Ubuntu/Components/Icon.qml
+Item
+    property string name
+    property color color
+    property color keyColor
+modules/Ubuntu/Components/Label.qml
+Text
+    property string fontSize
+modules/Ubuntu/Components/Label.qml
+Text
+    property string fontSize
+modules/Ubuntu/Components/ListItems/Base.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+    property internal children
+modules/Ubuntu/Components/ListItems/Base.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+    property internal children
+modules/Ubuntu/Components/ListItems/Caption.qml
+Item
+    property string text
+modules/Ubuntu/Components/ListItems/Caption.qml
+Item
+    property string text
+modules/Ubuntu/Components/ListItems/Divider.qml
+Image
+modules/Ubuntu/Components/ListItems/Divider.qml
+Image
+modules/Ubuntu/Components/ListItems/Empty.qml
+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()
+modules/Ubuntu/Components/ListItems/Empty.qml
+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()
+modules/Ubuntu/Components/ListItems/Expandable.qml
+Empty
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    property bool collapseOnClick
+    default property QtObject children
+modules/Ubuntu/Components/ListItems/Expandable.qml
+Empty
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    property bool collapseOnClick
+    default property QtObject children
+modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml
+Flickable
+    readonly property Item expandedItem
+    function expandItem(item)
+    function collapse()
+    default property QtObject children
+modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml
+Flickable
+    readonly property Item expandedItem
+    function expandItem(item)
+    function collapse()
+    default property QtObject children
+modules/Ubuntu/Components/ListItems/Header.qml
+Item
+    property string text
+    property internal __foregroundColor
+modules/Ubuntu/Components/ListItems/Header.qml
+Item
+    property string text
+    property internal __foregroundColor
+modules/Ubuntu/Components/ListItems/ItemSelector.qml
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+modules/Ubuntu/Components/ListItems/ItemSelector.qml
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+modules/Ubuntu/Components/ListItems/MultiValue.qml
+Base
+    property variant values
+modules/Ubuntu/Components/ListItems/MultiValue.qml
+Base
+    property variant values
+modules/Ubuntu/Components/ListItems/SingleControl.qml
+Empty
+    property Item control
+    function __updateControl()
+modules/Ubuntu/Components/ListItems/SingleControl.qml
+Empty
+    property Item control
+    function __updateControl()
+modules/Ubuntu/Components/ListItems/SingleValue.qml
+Base
+    property string value
+modules/Ubuntu/Components/ListItems/SingleValue.qml
+Base
+    property string value
+modules/Ubuntu/Components/ListItems/Standard.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+modules/Ubuntu/Components/ListItems/Standard.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+modules/Ubuntu/Components/ListItems/Subtitled.qml
+Base
+    property string text
+    property string subText
+modules/Ubuntu/Components/ListItems/Subtitled.qml
+Base
+    property string text
+    property string subText
+modules/Ubuntu/Components/ListItems/ThinDivider.qml
+Image
+modules/Ubuntu/Components/ListItems/ThinDivider.qml
+Image
+modules/Ubuntu/Components/ListItems/ValueSelector.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+modules/Ubuntu/Components/ListItems/ValueSelector.qml
+Empty
+    property variant icon
+    property url iconSource
+    property string iconName
+    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
+modules/Ubuntu/Components/MainView.qml
+PageTreeNode
+    property string applicationName
+    property bool anchorToKeyboard
+    property color headerColor
+    property color backgroundColor
+    property color footerColor
+    property bool automaticOrientation
+    property bool useDeprecatedToolbar
+    default property internal contentsItem
+    property list<Action> actions
+    property UnityActions.ActionManager actionManager
+modules/Ubuntu/Components/MainView.qml
+PageTreeNode
+    property string applicationName
+    property bool anchorToKeyboard
+    property color headerColor
+    property color backgroundColor
+    property color footerColor
+    property bool automaticOrientation
+    property bool useDeprecatedToolbar
+    default property internal contentsItem
+    property list<Action> actions
+    property UnityActions.ActionManager actionManager
+modules/Ubuntu/Components/Object.qml
+QtObject
+    default property internal children
+modules/Ubuntu/Components/Object.qml
+QtObject
+    default property internal children
+modules/Ubuntu/Components/OptionSelector.qml
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+modules/Ubuntu/Components/OptionSelector.qml
+ListItem.Empty
+    property var model
+    property bool expanded
+    property bool multiSelection
+    property bool colourImage
+    property real containerHeight
+    property int selectedIndex
+    property bool currentlyExpanded
+    readonly property real itemHeight
+    signal delegateClicked(int index)
+    signal expansionCompleted()
+modules/Ubuntu/Components/OptionSelectorDelegate.qml
+ListItem.Standard
+    property string text
+    property string subText
+    property url icon
+    property url iconSource
+    property string iconName
+    property bool constrainImage
+    property bool colourImage
+    property color assetColour
+    readonly property ListView listView
+    readonly property string fragColourShader
+modules/Ubuntu/Components/OptionSelectorDelegate.qml
+ListItem.Standard
+    property string text
+    property string subText
+    property url icon
+    property url iconSource
+    property string iconName
+    property bool constrainImage
+    property bool colourImage
+    property color assetColour
+    readonly property ListView listView
+    readonly property string fragColourShader
+modules/Ubuntu/Components/OrientationHelper.qml
+Item
+    property bool automaticOrientation
+    property bool transitionEnabled
+    property alias rotating
+    property int __orientationAngle
+    property int orientationAngle
+modules/Ubuntu/Components/OrientationHelper.qml
+Item
+    property bool automaticOrientation
+    property bool transitionEnabled
+    property alias rotating
+    property int __orientationAngle
+    property int orientationAngle
+modules/Ubuntu/Components/Page.qml
+PageTreeNode
+    property string title
+    property Flickable flickable
+    property list<Action> actions
+modules/Ubuntu/Components/Page.qml
+PageTreeNode
+    property string title
+    property Flickable flickable
+    property list<Action> actions
+modules/Ubuntu/Components/PageStack.qml
+PageTreeNode
+    property bool __showHeader
+    property int depth
+    property Item currentPage
+    function push(page, properties)
+    function pop()
+    function clear()
+modules/Ubuntu/Components/PageStack.qml
+PageTreeNode
+    property bool __showHeader
+    property int depth
+    property Item currentPage
+    function push(page, properties)
+    function pop()
+    function clear()
+modules/Ubuntu/Components/Panel.qml
+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
+modules/Ubuntu/Components/Panel.qml
+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
+modules/Ubuntu/Components/Pickers/DatePicker.qml
+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
+modules/Ubuntu/Components/Pickers/DatePicker.qml
+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
+modules/Ubuntu/Components/Pickers/Dialer.qml
+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)
+modules/Ubuntu/Components/Pickers/Dialer.qml
+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)
+modules/Ubuntu/Components/Pickers/DialerHand.qml
+StyledItem
+    property real value
+    property DialerHandGroup hand
+    readonly property Dialer dialer
+    default property list<QtObject> overlay
+    readonly property int index
+    property internal __grabber
+modules/Ubuntu/Components/Pickers/DialerHand.qml
+StyledItem
+    property real value
+    property DialerHandGroup hand
+    readonly property Dialer dialer
+    default property list<QtObject> overlay
+    readonly property int index
+    property internal __grabber
+modules/Ubuntu/Components/Pickers/Picker.qml
+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
+modules/Ubuntu/Components/Pickers/Picker.qml
+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
+modules/Ubuntu/Components/Pickers/PickerDelegate.qml
+AbstractButton
+    readonly property Picker picker
 modules/Ubuntu/Components/Pickers/PickerDelegate.qml
 AbstractButton
     readonly property Picker picker
@@ -313,174 +610,414 @@
     property Item target
     property var actions
     property Component delegate
-modules/Ubuntu/Components/Popups/ComposerSheet.qml
-SheetBase
-    signal cancelClicked
-    signal confirmClicked
-modules/Ubuntu/Components/Popups/DefaultSheet.qml
-SheetBase
-    property bool doneButton
-    signal closeClicked
-    signal doneClicked
-modules/Ubuntu/Components/Popups/Dialog.qml
-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
-modules/Ubuntu/Components/Popups/Popover.qml
-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()
-modules/Ubuntu/Components/Popups/PopupBase.qml
-OrientationHelper
-    property Item dismissArea
-    property bool grabDismissAreaEvents
-    function show()
-    function hide()
-    function __closeIfHidden()
-    function __closePopup()
-    property Item __foreground
-    property bool __closeOnDismissAreaPress
-    property internal __dimBackground
-    property internal __eventGrabber
-modules/Ubuntu/Components/Popups/SheetBase.qml
-PopupBase
-    default property list<Object> container
-    property real contentsWidth
-    property real contentsHeight
-    property string title
-    property bool modal
-    property internal __leftButton
-    property internal __rightButton
-modules/Ubuntu/Components/ProgressBar.qml
-AnimatedItem
-    property bool indeterminate
-    property real minimumValue
-    property real maximumValue
-    property real value
-modules/Ubuntu/Components/Scrollbar.qml
-StyledItem
-    property Flickable flickableItem
-    property int align
-    property bool __interactive
-    property internal __private
-modules/Ubuntu/Components/Slider.qml
-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
-modules/Ubuntu/Components/StyledItem.qml
-FocusScope
-    property Component style
-    readonly property Item __styleInstance
-modules/Ubuntu/Components/Switch.qml
-CheckBox
-modules/Ubuntu/Components/Tab.qml
-PageTreeNode
-    property string title
-    property url iconSource
-    property Item page
-    readonly property int index
-    property internal __protected
-modules/Ubuntu/Components/TabBar.qml
-StyledItem
-    property Item tabsItem
-    property var model
-    readonly property bool pressed
-    property bool selectionMode
-    property int selectedIndex
-    property bool alwaysSelectionMode
-    property bool animate
-modules/Ubuntu/Components/Tabs.qml
-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()
-modules/Ubuntu/Components/TextArea.qml
-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()
-    function forceActiveFocus()
+modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml
+Popover
+    property Item target
+    property var actions
+    property Component delegate
+modules/Ubuntu/Components/Popups/ComposerSheet.qml
+SheetBase
+    signal cancelClicked
+    signal confirmClicked
+modules/Ubuntu/Components/Popups/ComposerSheet.qml
+SheetBase
+    signal cancelClicked
+    signal confirmClicked
+modules/Ubuntu/Components/Popups/DefaultSheet.qml
+SheetBase
+    property bool doneButton
+    signal closeClicked
+    signal doneClicked
+modules/Ubuntu/Components/Popups/DefaultSheet.qml
+SheetBase
+    property bool doneButton
+    signal closeClicked
+    signal doneClicked
+modules/Ubuntu/Components/Popups/Dialog.qml
+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
+modules/Ubuntu/Components/Popups/Dialog.qml
+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
+modules/Ubuntu/Components/Popups/Popover.qml
+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()
+modules/Ubuntu/Components/Popups/Popover.qml
+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()
+modules/Ubuntu/Components/Popups/PopupBase.qml
+OrientationHelper
+    property Item dismissArea
+    property bool grabDismissAreaEvents
+    function show()
+    function hide()
+    function __closeIfHidden()
+    function __closePopup()
+    property Item __foreground
+    property bool __closeOnDismissAreaPress
+    property internal __dimBackground
+    property internal __eventGrabber
+modules/Ubuntu/Components/Popups/PopupBase.qml
+OrientationHelper
+    property Item dismissArea
+    property bool grabDismissAreaEvents
+    function show()
+    function hide()
+    function __closeIfHidden()
+    function __closePopup()
+    property Item __foreground
+    property bool __closeOnDismissAreaPress
+    property internal __dimBackground
+    property internal __eventGrabber
+modules/Ubuntu/Components/Popups/SheetBase.qml
+PopupBase
+    default property list<Object> container
+    property real contentsWidth
+    property real contentsHeight
+    property string title
+    property bool modal
+    property internal __leftButton
+    property internal __rightButton
+modules/Ubuntu/Components/Popups/SheetBase.qml
+PopupBase
+    default property list<Object> container
+    property real contentsWidth
+    property real contentsHeight
+    property string title
+    property bool modal
+    property internal __leftButton
+    property internal __rightButton
+modules/Ubuntu/Components/ProgressBar.qml
+AnimatedItem
+    property bool indeterminate
+    property real minimumValue
+    property real maximumValue
+    property real value
+modules/Ubuntu/Components/ProgressBar.qml
+AnimatedItem
+    property bool indeterminate
+    property real minimumValue
+    property real maximumValue
+    property real value
+modules/Ubuntu/Components/Scrollbar.qml
+StyledItem
+    property Flickable flickableItem
+    property int align
+    property bool __interactive
+    property internal __private
+modules/Ubuntu/Components/Scrollbar.qml
+StyledItem
+    property Flickable flickableItem
+    property int align
+    property bool __interactive
+    property internal __private
+modules/Ubuntu/Components/Slider.qml
+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
+modules/Ubuntu/Components/Slider.qml
+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
+modules/Ubuntu/Components/StyledItem.qml
+FocusScope
+    property Component style
+    readonly property Item __styleInstance
+modules/Ubuntu/Components/StyledItem.qml
+FocusScope
+    property Component style
+    readonly property Item __styleInstance
+modules/Ubuntu/Components/Switch.qml
+CheckBox
+modules/Ubuntu/Components/Switch.qml
+CheckBox
+modules/Ubuntu/Components/Tab.qml
+PageTreeNode
+    property string title
+    property url iconSource
+    property Item page
+    readonly property int index
+    property internal __protected
+modules/Ubuntu/Components/Tab.qml
+PageTreeNode
+    property string title
+    property url iconSource
+    property Item page
+    readonly property int index
+    property internal __protected
+modules/Ubuntu/Components/TabBar.qml
+StyledItem
+    property Item tabsItem
+    property var model
+    readonly property bool pressed
+    property bool selectionMode
+    property int selectedIndex
+    property bool alwaysSelectionMode
+    property bool animate
+modules/Ubuntu/Components/TabBar.qml
+StyledItem
+    property Item tabsItem
+    property var model
+    readonly property bool pressed
+    property bool selectionMode
+    property int selectedIndex
+    property bool alwaysSelectionMode
+    property bool animate
+modules/Ubuntu/Components/Tabs.qml
+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()
+modules/Ubuntu/Components/Tabs.qml
+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()
+modules/Ubuntu/Components/TextArea.qml
+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()
+    function forceActiveFocus()
+    property internal __internal
+modules/Ubuntu/Components/TextArea.qml
+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()
+    function forceActiveFocus()
+    property internal __internal
+modules/Ubuntu/Components/TextField.qml
+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 forceActiveFocus()
+    function isRightToLeft(start, end)
+    function moveCursorSelection(position, mode)
+    function redo()
+    function undo()
+    function remove(start, end)
+    function getText(start, end)
     property internal __internal
 modules/Ubuntu/Components/TextField.qml
 ActionItem
@@ -566,28 +1103,60 @@
     property color fieldText
 modules/Ubuntu/Components/ToolbarButton.qml
 ActionItem
-modules/Ubuntu/Components/ToolbarItems.qml
-Item
-    default property list<Object> contents
-    property Item back
-    property Item pageStack
-    property bool opened
-    property bool locked
-modules/Ubuntu/Components/UbuntuListView.qml
-ListView
-    property int expandedIndex
-modules/Ubuntu/Components/UbuntuNumberAnimation.qml
-NumberAnimation
-modules/Ubuntu/Components/UbuntuShape.qml
-Item
-    property color color
-    property color gradientColor
-    property string radius
-    property Item image
-    property url borderSource
-modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
-Item
-    property bool active
+modules/Ubuntu/Components/ToolbarButton.qml
+ActionItem
+modules/Ubuntu/Components/ToolbarItems.qml
+Item
+    default property list<Object> contents
+    property Item back
+    property Item pageStack
+    property bool opened
+    property bool locked
+modules/Ubuntu/Components/ToolbarItems.qml
+Item
+    default property list<Object> contents
+    property Item back
+    property Item pageStack
+    property bool opened
+    property bool locked
+modules/Ubuntu/Components/UbuntuListView.qml
+ListView
+    property int expandedIndex
+modules/Ubuntu/Components/UbuntuListView.qml
+ListView
+    property int expandedIndex
+modules/Ubuntu/Components/UbuntuNumberAnimation.qml
+NumberAnimation
+modules/Ubuntu/Components/UbuntuNumberAnimation.qml
+NumberAnimation
+modules/Ubuntu/Components/UbuntuShape.qml
+Item
+    property color color
+    property color gradientColor
+    property string radius
+    property Item image
+    property url borderSource
+modules/Ubuntu/Components/UbuntuShape.qml
+Item
+    property color color
+    property color gradientColor
+    property string radius
+    property Item image
+    property url borderSource
+modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
+Item
+    property bool active
+modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
+Item
+    property bool active
+modules/Ubuntu/Test/UbuntuTestCase.qml
+TestCase
+    function findChild(obj,objectName)
+    function findInvisibleChild(obj,objectName)
+    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
+    function mouseLongPress(item, x, y, button, modifiers, delay)
+    function tryCompareFunction(func, expectedResult, timeout)
 modules/Ubuntu/Test/UbuntuTestCase.qml
 TestCase
     function findChild(obj,objectName)
@@ -599,7 +1168,7 @@
 plugins.qmltypes
     name: "InverseMouseAreaType"
     prototype: "QQuickMouseArea"
-    exports: ["InverseMouseArea 0.1"]
+    exports: ["InverseMouseArea 0.1", "InverseMouseArea 1.0"]
     Property { name: "sensingArea"; type: "QQuickItem"; isPointer: true }
     Property { name: "topmostItem"; type: "bool" }
     Method {
@@ -607,7 +1176,7 @@
     Parameter { name: "point"; type: "QPointF" }
     name: "ShapeItem"
     prototype: "QQuickItem"
-    exports: ["Shape 0.1"]
+    exports: ["Shape 0.1", "Shape 1.0"]
     name: "HAlignment"
     name: "VAlignment"
     Property { name: "color"; type: "QColor" }
@@ -622,7 +1191,7 @@
     Method { name: "gridUnitChanged" }
     name: "UCAlarm"
     prototype: "QObject"
-    exports: ["Alarm 0.1"]
+    exports: ["Alarm 0.1", "Alarm 1.0"]
     name: "Status"
     name: "Operation"
     name: "Error"
@@ -645,14 +1214,14 @@
     Method { name: "reset" }
     name: "UCAlarmModel"
     prototype: "QAbstractListModel"
-    exports: ["AlarmModel 0.1"]
+    exports: ["AlarmModel 0.1", "AlarmModel 1.0"]
     Property { name: "count"; type: "int"; isReadonly: true }
     Method {
     name: "get"
     Parameter { name: "index"; type: "int" }
     name: "UCArgument"
     prototype: "QObject"
-    exports: ["Argument 0.1"]
+    exports: ["Argument 0.1", "Argument 1.0"]
     Property { name: "name"; type: "string" }
     Property { name: "help"; type: "string" }
     Property { name: "required"; type: "bool" }
@@ -662,7 +1231,7 @@
     Parameter { name: "i"; type: "int" }
     name: "UCArguments"
     prototype: "QObject"
-    exports: ["Arguments 0.1"]
+    exports: ["Arguments 0.1", "Arguments 1.0"]
     Property { name: "defaultArgument"; type: "UCArgument"; isPointer: true }
     Property { name: "arguments"; type: "UCArgument"; isList: true; isReadonly: true }
     Property { name: "values"; type: "QQmlPropertyMap"; isReadonly: true; isPointer: true }
@@ -675,10 +1244,10 @@
     Method { name: "quitWithError" }
     name: "UCInverseMouse"
     prototype: "UCMouse"
-    exports: ["InverseMouse 0.1"]
+    exports: ["InverseMouse 0.1", "InverseMouse 1.0"]
     name: "UCMouse"
     prototype: "QObject"
-    exports: ["Mouse 0.1"]
+    exports: ["Mouse 0.1", "Mouse 1.0"]
     name: "Priority"
     Property { name: "enabled"; type: "bool" }
     Property { name: "acceptedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
@@ -720,7 +1289,7 @@
     Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
-    exports: ["QQuickImageBase 0.1"]
+    exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]
     Property { name: "source"; type: "QUrl" }
     Signal {
     name: "sourceChanged"
@@ -730,14 +1299,14 @@
     Parameter { type: "QUrl" }
     name: "UCStateSaver"
     prototype: "QObject"
-    exports: ["StateSaver 0.1"]
+    exports: ["StateSaver 0.1", "StateSaver 1.0"]
     name: "UCStateSaverAttached"
     prototype: "QObject"
     Property { name: "enabled"; type: "bool" }
     Property { name: "properties"; type: "string" }
     name: "UCUbuntuAnimation"
     prototype: "QObject"
-    exports: ["UbuntuAnimation 0.1"]
+    exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"]
     Property { name: "SnapDuration"; type: "int"; isReadonly: true }
     Property { name: "FastDuration"; type: "int"; isReadonly: true }
     Property { name: "BriskDuration"; type: "int"; isReadonly: true }
@@ -747,7 +1316,7 @@
     Property { name: "StandardEasingReverse"; type: "QEasingCurve"; isReadonly: true }
     name: "UCUnits"
     prototype: "QObject"
-    exports: ["UCUnits 0.1"]
+    exports: ["UCUnits 0.1", "UCUnits 1.0"]
     Property { name: "gridUnit"; type: "float" }
     Method {
     name: "dp"
@@ -757,13 +1326,13 @@
     Parameter { name: "value"; type: "float" }
     name: "UCUriHandler"
     prototype: "QObject"
-    exports: ["UriHandler 0.1"]
+    exports: ["UriHandler 0.1", "UriHandler 1.0"]
     Signal {
     name: "opened"
     Parameter { name: "uris"; type: "QStringList" }
     name: "UbuntuI18n"
     prototype: "QObject"
-    exports: ["i18n 0.1"]
+    exports: ["i18n 0.1", "i18n 1.0"]
     Property { name: "domain"; type: "string" }
     Property { name: "language"; type: "string" }
     Method {
@@ -790,17 +1359,17 @@
     Parameter { name: "n"; type: "int" }
     name: "ULConditionalLayout"
     prototype: "QObject"
-    exports: ["ConditionalLayout 0.1"]
+    exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]
     Property { name: "name"; type: "string" }
     Property { name: "when"; type: "QQmlBinding"; isPointer: true }
     Property { name: "layout"; type: "QQmlComponent"; isPointer: true }
     name: "ULItemLayout"
     prototype: "QQuickItem"
-    exports: ["ItemLayout 0.1"]
+    exports: ["ItemLayout 0.1", "ItemLayout 1.0"]
     Property { name: "item"; type: "string" }
     name: "ULLayouts"
     prototype: "QQuickItem"
-    exports: ["Layouts 0.1"]
+    exports: ["Layouts 0.1", "Layouts 1.0"]
     Property { name: "currentLayout"; type: "string"; isReadonly: true }
     Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
     name: "ULLayoutsAttached"
@@ -808,7 +1377,7 @@
     Property { name: "item"; type: "string" }
     name: "UPMCpuUsage"
     prototype: "QQuickItem"
-    exports: ["CpuUsage 0.1"]
+    exports: ["CpuUsage 0.1", "CpuUsage 1.0"]
     Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true }
     Property { name: "period"; type: "int" }
     Property { name: "samplingInterval"; type: "int" }
@@ -820,7 +1389,7 @@
     Property { name: "currentValue"; type: "int"; isReadonly: true }
     name: "UPMRenderingTimes"
     prototype: "QQuickItem"
-    exports: ["RenderingTimes 0.1"]
+    exports: ["RenderingTimes 0.1", "RenderingTimes 1.0"]
     Property { name: "period"; type: "int" }
     Property { name: "samples"; type: "int" }
     Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true }
@@ -830,5 +1399,5 @@
     Parameter { name: "renderTime"; type: "qlonglong" }
     name: "UPMTextureFromImage"
     prototype: "QQuickItem"
-    exports: ["TextureFromImage 0.1"]
+    exports: ["TextureFromImage 0.1", "TextureFromImage 1.0"]
     Property { name: "image"; type: "QImage" }
 
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-01-23 17:13:24 +0000
+++ documentation/overview.qdoc	2014-04-23 09:21:19 +0000
@@ -31,70 +31,70 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.0
      \endcode
      \annotatedlist ubuntu
 
      \part List Items
      Available through:
      \code
-         import Ubuntu.Components.ListItems 0.1
+         import Ubuntu.Components.ListItems 1.0
      \endcode
      \annotatedlist ubuntu-listitems
 
      \part Pickers
      Available through:
      \code
-         import Ubuntu.Components.Pickers 0.1
+         import Ubuntu.Components.Pickers 1.0
      \endcode
      \annotatedlist ubuntu-pickers
 
      \part Popovers, Sheets and Dialogs
      Available through:
      \code
-         import Ubuntu.Components.Popups 0.1
+         import Ubuntu.Components.Popups 1.0
      \endcode
      \annotatedlist ubuntu-popups
 
      \part Layouting
      Available through:
      \code
-         import Ubuntu.Layouts 0.1
+         import Ubuntu.Layouts 1.0
      \endcode
      \annotatedlist ubuntu-layouts
 
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.0
      \endcode
      \annotatedlist theming
 
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.0
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.0
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.0
      \endcode
      \annotatedlist ubuntu-services
 
      \part Performance Metrics
      Available through:
      \code
-         import Ubuntu.PerformanceMetrics 0.1
+         import Ubuntu.PerformanceMetrics 1.0
      \endcode
      \annotatedlist ubuntu-performance-metrics
  */
 
=== modified file 'documentation/resolution-independence.qdoc'
--- documentation/resolution-independence.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/resolution-independence.qdoc	2014-04-23 09:21:19 +0000
@@ -64,7 +64,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Item {
         width: units.gu(2)
@@ -79,7 +79,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Rectangle {
         height: units.dp(1)
@@ -143,7 +143,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Label {
         fontSize: "small"
 
=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
--- documentation/snippets/layouts/SimpleLayout.qml	2013-06-25 14:25:43 +0000
+++ documentation/snippets/layouts/SimpleLayout.qml	2014-04-23 09:21:19 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout1.qml'
--- documentation/snippets/layouts/layout1.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout1.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout2.qml'
--- documentation/snippets/layouts/layout2.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout2.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout3.qml'
--- documentation/snippets/layouts/layout3.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout3.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout6.qml'
--- documentation/snippets/layouts/layout6.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout6.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout7.qml'
--- documentation/snippets/layouts/layout7.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout7.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
--- documentation/snippets/statesaver/ColorChanger.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/ColorChanger.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 //![color-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 //![group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Rectangle {
     id: root
 
=== modified file 'documentation/ubuntu-components-listitems.qdoc'
--- documentation/ubuntu-components-listitems.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-listitems.qdoc	2014-04-23 09:21:19 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.ListItems 0.1
+    \qmlmodule Ubuntu.Components.ListItems 1.0
     \title List Items
 */
 
=== modified file 'documentation/ubuntu-components-pickers.qdoc'
--- documentation/ubuntu-components-pickers.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-pickers.qdoc	2014-04-23 09:21:19 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Pickers 0.1
+    \qmlmodule Ubuntu.Components.Pickers 1.0
     \title Pickers
 */
 
=== modified file 'documentation/ubuntu-components-popups.qdoc'
--- documentation/ubuntu-components-popups.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-popups.qdoc	2014-04-23 09:21:19 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Popups 0.1
+    \qmlmodule Ubuntu.Components.Popups 1.0
     \title Popovers, Sheets and Dialogs 
 */
 
=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components.qdoc	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 0.1
+    \qmlmodule Ubuntu.Components 1.0
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */
 
=== modified file 'documentation/ubuntu-layouts.qdoc'
--- documentation/ubuntu-layouts.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-layouts.qdoc	2014-04-23 09:21:19 +0000
@@ -15,6 +15,11 @@
  */
 
 /*!
+    \qmlmodule Ubuntu.Layouts 1.0
+    \title Layouts
+*/
+
+/*!
   \page ubuntu-layouts.html
   \title Layouts - Introduction
   \nextpage Layouts - Terminology
@@ -177,7 +182,7 @@
   \section2 Import
   First of all, in order to use the layouting abilities, you need to import Ubuntu.Layouts.
   \code
-  import Ubuntu.Layouts 0.1
+  import Ubuntu.Layouts 1.0
   \endcode
 
   This layout will have the red button anchored to the parent's left, top and bottom, having
 
=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2013-07-03 06:41:54 +0000
+++ examples/calculator/calculator.qml	2014-04-23 09:21:19 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator
 
 
=== modified file 'examples/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2013-07-02 14:42:23 +0000
+++ examples/calculator/components/DefaultLayout.qml	2014-04-23 09:21:19 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Item {
     id: buttonGrid
 
=== modified file 'examples/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2013-07-02 14:42:23 +0000
+++ examples/calculator/components/Functions.qml	2014-04-23 09:21:19 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Layouts 1.0
 
 Grid {
     id: buttonGrid
 
=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2013-07-04 21:36:23 +0000
+++ examples/jokes/jokes.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 import QtMultimedia 5.0
 
 /*!
 
=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2013-07-04 21:36:23 +0000
+++ examples/locale/locale.qml	2014-04-23 09:21:19 +0000
@@ -16,8 +16,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!
   \brief An application to test locales on the device
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2013-11-28 11:11:55 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Label.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Template {
     objectName: "labelsTemplate"
 
=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2013-05-06 16:24:50 +0000
+++ examples/unit-converter/unit-converter.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 import "conversion.js" as Converter
 
 /*!
 
=== modified file 'manual-tests/button.qml'
--- manual-tests/button.qml	2012-11-14 07:40:05 +0000
+++ manual-tests/button.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Button {
    id: button
 
=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The AbstractButton class defines the behavior of the button.
 
 
=== modified file 'modules/Ubuntu/Components/Action.qml'
--- modules/Ubuntu/Components/Action.qml	2014-02-24 18:24:59 +0000
+++ modules/Ubuntu/Components/Action.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Action
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Describe an action that can be re-used in, for example a \l Button
 
 
=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2014-02-24 18:24:59 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \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
 
=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2013-08-28 10:41:42 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActionList
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief List of \l Action items
 */
 
=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActivityIndicator
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The ActivityIndicator component visually indicates that a task of
     unknown duration is in progress, e.g. busy indication, connection in progress
 
=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2013-06-26 19:25:09 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype AnimatedItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \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,
 
=== modified file 'modules/Ubuntu/Components/Button.qml'
--- modules/Ubuntu/Components/Button.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/Button.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Button
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Standard Ubuntu button.
 
 
=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2013-10-01 14:46:11 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype CheckBox
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \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
 
=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qml'
--- modules/Ubuntu/Components/CrossFadeImage.qml	2013-10-08 20:10:59 +0000
+++ modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 // 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 0.1 as Ubuntu
+import Ubuntu.Components 1.0 as Ubuntu
 
 /*!
    \qmltype CrossFadeImage
@@ -28,7 +28,7 @@
 
    \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         CrossFadeImage {
             width: units.gu(100)
 
=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-03-12 09:36:00 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-04-23 09:21:19 +0000
@@ -15,16 +15,12 @@
  */
 
 import QtQuick 2.0
-// 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 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \internal
     \qmltype Header
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
 */
 StyledItem {
@@ -44,7 +40,7 @@
     Behavior on y {
         enabled: animate && !(header.flickable && header.flickable.moving)
         SmoothedAnimation {
-            duration: Ubuntu.UbuntuAnimation.BriskDuration
+            duration: UbuntuAnimation.BriskDuration
         }
     }
 
 
=== modified file 'modules/Ubuntu/Components/Icon.qml'
--- modules/Ubuntu/Components/Icon.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/Icon.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Icon
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The Icon component displays an icon from the icon theme.
 
 
=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-01-23 19:01:47 +0000
+++ modules/Ubuntu/Components/Label.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Label
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Text with Ubuntu styling.
 
 
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-02-13 10:27:14 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Base
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Parent class of various list item classes that can have
         an icon and a progression symbol.
 
=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2013-07-04 22:12:37 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-23 09:21:19 +0000
@@ -15,17 +15,17 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Caption
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item that shows a piece of text.
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {
                 text: "Default list item."
 
=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
--- modules/Ubuntu/Components/ListItems/Divider.qml	2012-10-19 01:09:07 +0000
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Divider
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Divider to break up list items into groups.
 
 
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-02-04 14:39:53 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Empty
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item with no contents.
     The Empty class can be used for generic list items containing other
@@ -34,8 +34,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
             Model {
 
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-03-17 16:35:27 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-23 09:21:19 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Expandable
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief An expandable list item with no contents.
     The Expandable class can be used for generic list items containing other
@@ -35,8 +35,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
             ListModel {
 
=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-02-26 09:46:30 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype ExpandablesColumn
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A column to be used together with the \l Expandable item.
     This lays out its content just like a regular Column inside a Flickable but
@@ -29,8 +29,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {
             anchors { left: parent.left; right: parent.right }
 
=== modified file 'modules/Ubuntu/Components/ListItems/Header.qml'
--- modules/Ubuntu/Components/ListItems/Header.qml	2013-02-06 11:40:31 +0000
+++ modules/Ubuntu/Components/ListItems/Header.qml	2014-04-23 09:21:19 +0000
@@ -18,13 +18,13 @@
 
 /*!
     \qmltype Header
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Header for grouping list items together
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Header { text: "Title" }
             ListItem.Standard { text: "Item one" }
 
=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 // internal helper class to create the visuals
 // for the icon.
 
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-02-18 14:23:57 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-04-23 09:21:19 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import "." as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype ItemSelector
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief ListItem 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.
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             anchors.left: parent.left
             anchors.right: parent.right
 
=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2013-08-29 18:47:30 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 // internal helper class for text inside the list items.
 Label {
 
=== modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml'
--- modules/Ubuntu/Components/ListItems/MultiValue.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/MultiValue.qml	2014-04-23 09:21:19 +0000
@@ -18,14 +18,14 @@
 
 /*!
     \qmltype MultiValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying multiple values.
     \b{This component is under heavy development.}
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.MultiValue {
                 text: "Label"
 
=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2013-12-09 12:23:15 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 // Internal helper class for the visuals of
 // the progression symbol.
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-07-14 20:18:08 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-23 09:21:19 +0000
@@ -15,19 +15,19 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
 
 /*!
     \qmltype SingleControl
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item containing a single control
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleControl {
                 control: Button {
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml'
--- modules/Ubuntu/Components/ListItems/SingleValue.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/SingleValue.qml	2014-04-23 09:21:19 +0000
@@ -18,13 +18,13 @@
 
 /*!
     \qmltype SingleValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item displaying a single value
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleValue {
                 text: "Label"
 
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2013-11-07 19:45:58 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Standard
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief The standard list item class. It shows a basic list item
         with a label (text), and optionally an icon, a progression arrow,
@@ -30,8 +30,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {
                 text: "Selectable standard list item"
 
=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-23 09:21:19 +0000
@@ -15,18 +15,18 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype MultiValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying a second string under the main label.
     \b{This component is under heavy development.}
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Subtitled {
                 text: "Idle"
 
=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2013-11-19 08:51:02 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ThinDivider
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Narrow line used as a divider between ListItems.
 
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             width: 250
             ListItem.ThinDivider {} //can be used as header for list
 
=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-23 09:21:19 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
 
     \qmltype ValueSelector
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying single selected value when not expanded,
     where expanding it opens a listing of all the possible values for selection.
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             width: 250
             ListItem.ValueSelector {
 
=== modified file 'modules/Ubuntu/Components/ListItems/qmldir'
--- modules/Ubuntu/Components/ListItems/qmldir	2014-02-13 11:33:09 +0000
+++ modules/Ubuntu/Components/ListItems/qmldir	2014-04-23 09:21:19 +0000
@@ -1,3 +1,4 @@
+module Ubuntu.Components.ListItems
 Empty 0.1 Empty.qml
 Base 0.1 Base.qml
 Caption 0.1 Caption.qml
@@ -16,3 +17,20 @@
 ThinDivider 0.1 ThinDivider.qml
 Expandable 0.1 Expandable.qml
 ExpandablesColumn 0.1 ExpandablesColumn.qml
+
+#version 1.0
+Empty 1.0 Empty.qml
+Base 1.0 Base.qml
+Caption 1.0 Caption.qml
+Divider 1.0 Divider.qml
+Header 1.0 Header.qml
+MultiValue 1.0 MultiValue.qml
+ItemSelector 1.0 ItemSelector.qml
+ValueSelector 1.0 ValueSelector.qml
+SingleValue 1.0 SingleValue.qml
+Standard 1.0 Standard.qml
+Subtitled 1.0 Subtitled.qml
+SingleControl 1.0 SingleControl.qml
+ThinDivider 1.0 ThinDivider.qml
+Expandable 1.0 Expandable.qml
+ExpandablesColumn 1.0 ExpandablesColumn.qml
 
=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-04-04 11:03:45 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-04-23 09:21:19 +0000
@@ -16,12 +16,12 @@
 
 import QtQuick 2.0
 import Ubuntu.Unity.Action 1.1 as UnityActions
-import Ubuntu.PerformanceMetrics 0.1
+import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
 /*!
     \qmltype MainView
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief MainView is the root Item that should be used for all applications.
         It automatically adds a header and toolbar for its contents and can
@@ -30,7 +30,7 @@
     The simplest way to use a MainView is to include a \l Page object inside the MainView:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(48)
@@ -57,7 +57,7 @@
     will automatically hide and show when the user scrolls up or down:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(48)
@@ -89,7 +89,7 @@
     A toolbar can be added to the application by setting the tools property of the \l Page:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(48)
@@ -169,7 +169,7 @@
       the content:
       \qml
           import QtQuick 2.0
-          import Ubuntu.Components 0.1
+          import Ubuntu.Components 1.0
 
           MainView {
               width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/Object.qml'
--- modules/Ubuntu/Components/Object.qml	2012-11-14 11:01:37 +0000
+++ modules/Ubuntu/Components/Object.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 /*!
     \qmltype Object
     \internal
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Internal type used for lightweight objects that can have children.
 */
 
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2013-12-13 15:50:35 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-04-23 09:21:19 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 
 /*!
     \qmltype OptionSelector
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \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.
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
         Column {
             spacing: units.gu(3)
 
 
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-03-04 12:16:38 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype OptionSelectorDelegate
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu-components
     \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
 
@@ -24,7 +24,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
         Column {
             width: 250
             OptionSelector {
@@ -45,7 +45,7 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 
 ListItem.Standard {
     id: option
 
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-11-27 11:15:17 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-04-23 09:21:19 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype OrientationHelper
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The OrientationHelper automatically rotates its children following the
            orientation of the device.
@@ -188,8 +188,8 @@
                     RotationAnimation {
                         target: orientationHelper
                         properties: "rotation"
-                        duration: Ubuntu.UbuntuAnimation.FastDuration
-                        easing: Ubuntu.UbuntuAnimation.StandardEasing
+                        duration: UbuntuAnimation.FastDuration
+                        easing: UbuntuAnimation.StandardEasing
                         direction: RotationAnimation.Shortest
                     }
                 }
 
=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2014-04-07 10:03:39 +0000
+++ modules/Ubuntu/Components/Page.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Page
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief A page is the basic Item that must be used inside the \l MainView,
         \l PageStack and \l Tabs.
@@ -33,7 +33,7 @@
 
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(48)
@@ -94,7 +94,7 @@
       and anchors to the top of the page or fills the page. For example:
       \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(30)
 
=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2013-08-22 17:15:35 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageStack
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief A stack of \l Page items that is used for inter-Page navigation.
         Pages on the stack can be popped, and new Pages can be pushed.
@@ -39,8 +39,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
             width: units.gu(48)
 
=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2013-07-18 16:42:06 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 /*!
     \internal
     \qmltype PageTreeNode
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
 
 
=== modified file 'modules/Ubuntu/Components/PageWrapper.qml'
--- modules/Ubuntu/Components/PageWrapper.qml	2013-03-11 16:20:14 +0000
+++ modules/Ubuntu/Components/PageWrapper.qml	2014-04-23 09:21:19 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Internal class used by \l PageStack
 
 
=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-02 09:47:42 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 
 /*!
     \qmltype Panel
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief A panel that can be swiped in and out from an edge of the window by the user.
     For most applications, it is highly recommended to use the \l MainView instead which includes
@@ -38,7 +38,7 @@
     A black panel that can be swiped in from the lower-right of the window can be created like this:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         Item {
             width: units.gu(80)
@@ -69,7 +69,7 @@
     A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         Item {
             width: units.gu(80)
@@ -106,7 +106,7 @@
     signals are forwarded from the panel by calling the child's trigger() function. Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         Rectangle {
             color: Theme.palette.normal.background
 
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype DatePicker
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DatePicker component provides date and time value picking functionality.
 
@@ -36,8 +36,8 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.0
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -56,8 +56,8 @@
     which shows only year and month date units would look as follows:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.0
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -75,8 +75,8 @@
     The following example demonstrates how to use DatePicker for time picking.
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.0
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -112,8 +112,8 @@
     \endlist
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.0
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
 
=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2013-12-10 16:52:07 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     circular: true
 
=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2013-09-24 10:42:52 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Dialer
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Dialer is a phone dialer style picker component.
 
@@ -35,7 +35,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components.Pickers 1.0
 
     Dialer {
         size: units.gu(20)
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2013-09-24 11:02:17 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype DialerHand
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DialerHand represents a value selector on a Dialer.
 
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2013-09-12 09:19:28 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-23 09:21:19 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.0
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2013-12-16 13:01:41 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     circular: (count >= 11)
 
=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Picker
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Picker is a slot-machine style value selection component.
 
@@ -35,8 +35,8 @@
     Example:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.0
+    import Ubuntu.Components.Pickers 1.0
 
     Picker {
         model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"]
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype PickerDelegate
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief PickerDelegate component serves as base for Picker delegates.
 
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-02-19 10:36:14 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-23 09:21:19 +0000
@@ -16,13 +16,13 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
 
 /*!
     \qmltype PickerPanel
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu-pickers
     \brief Provides a panel for opening a DatePicker in place of the input panel or
     as Popover, depending on the form factor.
@@ -32,7 +32,7 @@
     on date pickers.
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     MainWindow {
         width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Row {
     id: row
 
=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 PickerModelBase {
     // local properties
 
=== modified file 'modules/Ubuntu/Components/Pickers/qmldir'
--- modules/Ubuntu/Components/Pickers/qmldir	2013-12-10 16:37:04 +0000
+++ modules/Ubuntu/Components/Pickers/qmldir	2014-04-23 09:21:19 +0000
@@ -8,3 +8,10 @@
 internal MonthModel MonthModel.qml
 internal DayModel DayModel.qml
 internal PickerModelBase PickerModelBase.qml
+
+#version 1.0
+Picker 1.0 Picker.qml
+PickerDelegate 1.0 PickerDelegate.qml
+Dialer 1.0 Dialer.qml
+DialerHand 1.0 DialerHand.qml
+DatePicker 1.0 DatePicker.qml
 
=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2013-08-07 12:50:35 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-23 09:21:19 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
-import "../ListItems" 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
 
 /*!
     \qmltype ActionSelectionPopover
     \inherits Popover
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief A special popover presenting actions to the user. The popover is closed
         automatically when the action is chosen.
 
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2013-11-05 00:34:46 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Much like the \l DefaultSheet the Composer Sheet allows an application to insert a content
         view over the focused view without disrupting the navigation pattern. However the Composer Sheet
@@ -31,8 +31,8 @@
 
     Example:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             Component {
 
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-23 09:21:19 +0000
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype DefaultSheet
     \inherits SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The Default Sheet allows an application to insert a content view over the focused view
         without disrupting the navigation pattern (tabs state or drill-down path are maintained. When
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             Component {
 
=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2013-07-15 10:28:04 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-23 09:21:19 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
     \qmltype Dialog
     \inherits PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The Dialog caters for cases in which the application requires the user to determine
         between optional actions. The Dialog will interrupt the user flow and lock the view
@@ -33,8 +33,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             width: units.gu(80)
 
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-01-10 15:34:32 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-23 09:21:19 +0000
@@ -16,12 +16,12 @@
 
 import QtQuick 2.0
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype Popover
     \inherits PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief A popover allows an application to present additional content without changing the view.
         A popover has a fixed width and automatic height, depending on is contents.
@@ -32,9 +32,9 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
+        import Ubuntu.Components.Popups 1.0
 
         Rectangle {
             color: Theme.palette.normal.background
 
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The base class for all dialogs, sheets and popovers. Do not use directly.
 
 
=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Parent class of different types of sheets. Not to be used directly.
 
 
=== modified file 'modules/Ubuntu/Components/Popups/qmldir'
--- modules/Ubuntu/Components/Popups/qmldir	2013-07-13 14:35:21 +0000
+++ modules/Ubuntu/Components/Popups/qmldir	2014-04-23 09:21:19 +0000
@@ -9,3 +9,14 @@
 ActionSelectionPopover 0.1 ActionSelectionPopover.qml
 
 PopupUtils 0.1 popupUtils.js
+
+#version 1.0
+Dialog 1.0 Dialog.qml
+PopupBase 1.0 PopupBase.qml
+Popover 1.0 Popover.qml
+SheetBase 1.0 SheetBase.qml
+DefaultSheet 1.0 DefaultSheet.qml
+ComposerSheet 1.0 ComposerSheet.qml
+ActionSelectionPopover 1.0 ActionSelectionPopover.qml
+
+PopupUtils 1.0 popupUtils.js
 
=== modified file 'modules/Ubuntu/Components/ProgressBar.qml'
--- modules/Ubuntu/Components/ProgressBar.qml	2013-08-01 14:06:36 +0000
+++ modules/Ubuntu/Components/ProgressBar.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ProgressBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The ProgressBar component visually indicates the progress of a process of
     determinate or indeterminate duration.
 
=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ScrollBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The ScrollBar component provides scrolling functionality for
     scrollable views (i.e. Flickable, ListView).
 
=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Slider.qml	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Slider
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Slider is a component to select a value from a continuous range of
      values.
 
=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2013-06-27 15:36:28 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract StyledItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup theming
     \brief The StyledItem class allows items to be styled by the theme.
 
 
=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Switch.qml	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Switch
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Switch is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l CheckBox, the
 
=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2014-04-16 11:51:47 +0000
+++ modules/Ubuntu/Components/Tab.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tab
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Component to represent a single tab in a \l Tabs environment.
 
 
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype TabBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Tab bar that will be shown in the header when \l Tabs is active.
         This component does not need to be instantiated by the developer, it is
 
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-16 11:51:47 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tabs
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The Tabs class provides an environment where multible \l Tab
     children can be added, and the user is presented with a tab
@@ -33,8 +33,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
             width: units.gu(48)
@@ -104,7 +104,7 @@
 
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             id: mainView
 
=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype TextArea
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The TextArea item displays a block of editable, scrollable, formatted
     text.
 
=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-03-17 17:58:47 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype TextField
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The TextField element displays a single line of editable plain text.
     Input constraints can be set through validator or inputMask. Setting echoMode
@@ -504,7 +504,7 @@
 
       \qml
       import QtQuick 2.0
-      import Ubuntu.Components 0.1
+      import Ubuntu.Components 1.0
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true
 
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-03-17 18:17:23 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 import "Popups" 0.1
 
 ActionSelectionPopover {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Image {
     id: container
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2013-08-21 15:35:56 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: bubbleShape
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2013-07-01 22:26:49 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-23 09:21:19 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: buttonForeground
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-23 09:21:19 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: buttonStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-02-05 19:59:43 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: checkBoxStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2013-12-16 15:07:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
 
 Item {
     id: control
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2013-09-12 09:17:11 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     // style API
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2013-09-24 14:22:16 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 import QtGraphicalEffects 1.0
 
 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2013-07-13 15:35:59 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: dialogForegroundStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-03-12 09:36:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-23 09:21:19 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: headerStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2013-09-03 10:12:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: ambianceStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-02-07 16:13:47 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-04-23 09:21:19 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     // styling properties
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2013-08-28 10:43:46 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: ambianceStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     property real minFade: 0.2
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2013-12-12 14:10:17 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0
 
 Item {
     id: control
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: progressBarStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: progressionVisualStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-02-06 14:07:33 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*
   The visuals handle both active and passive modes. This behavior is driven yet by
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 EditorCursorStyle {
     id: cursor
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*
   The default slider style consists of a bar and a thumb shape.
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: switchStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-16 11:51:47 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: tabBarStyle
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2013-07-04 21:54:54 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 // frame
 Item {
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2013-07-04 21:36:23 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2013-07-04 21:36:23 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-23 09:21:19 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: visuals
 
=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2014-04-01 12:47:51 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2014-04-23 09:21:19 +0000
@@ -19,7 +19,7 @@
 /*!
     \internal
     \qmltype Toolbar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Application toolbar. This class is not exposed because it will
             be automatically added when a Page defines tools.
 
=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarButton
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief An \l ActionItem that represents a button in the toolbar.
         ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.
@@ -28,7 +28,7 @@
         Example of different ways to define the toolbar button:
         \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-04-23 09:21:19 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarItems
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief Row of Items to be placed in a toolbar.
 
@@ -38,7 +38,7 @@
     be visible to the user:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(50)
@@ -70,7 +70,7 @@
     the full height of the toolbar, and other Items you will probably want to center vertically:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         MainView {
             width: units.gu(50)
@@ -119,7 +119,7 @@
       visible in the toolbar, instead of the default toolbar-styled back button:
         \qml
             import QtQuick 2.0
-            import Ubuntu.Components 0.1
+            import Ubuntu.Components 1.0
 
             MainView {
                 width: units.gu(50)
 
=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
--- modules/Ubuntu/Components/UbuntuListView.qml	2014-02-25 12:23:39 +0000
+++ modules/Ubuntu/Components/UbuntuListView.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 
 /*!
     \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief A ListView with special features tailored for a look and feel fitting the
     Ubuntu Touch platform.
@@ -30,8 +30,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.0
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
             ListModel {
 
=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2013-07-09 15:42:50 +0000
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-04-23 09:21:19 +0000
@@ -16,11 +16,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype UbuntuNumberAnimation
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
            settings to ensure that Ubuntu applications are consistent in their animations.
@@ -29,7 +29,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Rectangle {
         width: 100; height: 100
@@ -51,6 +51,6 @@
     \l UbuntuAnimation manually in order to ensure consistency.
 */
 NumberAnimation {
-    duration: Ubuntu.UbuntuAnimation.FastDuration
-    easing: Ubuntu.UbuntuAnimation.StandardEasing
+    duration: UbuntuAnimation.FastDuration
+    easing: UbuntuAnimation.StandardEasing
 }
 
=== modified file 'modules/Ubuntu/Components/UbuntuShape.qml'
--- modules/Ubuntu/Components/UbuntuShape.qml	2013-07-05 07:14:36 +0000
+++ modules/Ubuntu/Components/UbuntuShape.qml	2014-04-23 09:21:19 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype UbuntuShape
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup ubuntu
     \brief The UbuntuShape item provides a standard Ubuntu shaped rounded rectangle.
 
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         UbuntuShape {
             color: "lightblue"
@@ -44,7 +44,7 @@
     \endqml
 
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.0
 
         UbuntuShape {
             image: Image {
@@ -100,7 +100,7 @@
     implicitWidth: shape.implicitWidth
     implicitHeight: shape.implicitHeight
 
-    Ubuntu.Shape {
+    Shape {
         id: shape
         anchors.fill: parent
         /* FIXME: only set the ShapeItem::image property when the Image's source is loaded
 
=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-02-24 10:36:27 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-23 09:21:19 +0000
@@ -30,7 +30,7 @@
 /*!
  * \qmltype i18n
  * \instantiates UbuntuI18n
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief i18n is a context property that provides internationalization support.
  *
 
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-03-24 19:12:32 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 /*!
   \qmltype InverseMouseArea
   \instantiates InverseMouseAreaType
-  \inqmlmodule Ubuntu.Components 0.1
+  \inqmlmodule Ubuntu.Components 1.0
   \ingroup ubuntu
   \brief The InverseMouseArea captures mouse events happening outside of a given
   area.
@@ -33,7 +33,7 @@
   Popup.qml
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 0.1
+  import Ubuntu.Components 1.0
 
   Rectangle {
       anchors.centerIn: parent
@@ -53,7 +53,7 @@
 
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 0.1
+  import Ubuntu.Components 1.0
 
   Item {
       width: 640
@@ -77,7 +77,7 @@
   a component which is either a parent of the mouse area or a sibling of it.
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 0.1
+  import Ubuntu.Components 1.0
 
   Item {
       width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-14 15:59:29 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-23 09:21:19 +0000
@@ -151,31 +151,38 @@
     }
 }
 
-void UbuntuComponentsPlugin::registerTypes(const char *uri)
+void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
 {
-    Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
-
-    qmlRegisterSingletonType<QObject>(uri, 0, 1, "UbuntuColors", registerUbuntuColors);
-    qmlRegisterUncreatableType<UbuntuI18n>(uri, 0, 1, "i18n", "Singleton object");
-    qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, 0, 1, "QQuickImageBase");
-    qmlRegisterUncreatableType<UCUnits>(uri, 0, 1, "UCUnits", "Not instantiable");
-    qmlRegisterType<ShapeItem>(uri, 0, 1, "Shape");
-    qmlRegisterType<InverseMouseAreaType>(uri, 0, 1, "InverseMouseArea");
-    qmlRegisterType<QQuickMimeData>(uri, 0, 1, "MimeData");
-    qmlRegisterSingletonType<QQuickClipboard>(uri, 0, 1, "Clipboard", registerClipboard);
-    qmlRegisterSingletonType<UCUbuntuAnimation>(uri, 0, 1, "UbuntuAnimation", registerUCUbuntuAnimation);
-    qmlRegisterType<UCArguments>(uri, 0, 1, "Arguments");
-    qmlRegisterType<UCArgument>(uri, 0, 1, "Argument");
+    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors);
+    qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
+    qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
+    qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
+    qmlRegisterType<ShapeItem>(uri, major, minor, "Shape");
+    qmlRegisterType<InverseMouseAreaType>(uri, major, minor, "InverseMouseArea");
+    qmlRegisterType<QQuickMimeData>(uri, major, minor, "MimeData");
+    qmlRegisterSingletonType<QQuickClipboard>(uri, major, minor, "Clipboard", registerClipboard);
+    qmlRegisterSingletonType<UCUbuntuAnimation>(uri, major, minor, "UbuntuAnimation", registerUCUbuntuAnimation);
+    qmlRegisterType<UCArguments>(uri, major, minor, "Arguments");
+    qmlRegisterType<UCArgument>(uri, major, minor, "Argument");
     qmlRegisterType<QQmlPropertyMap>();
-    qmlRegisterType<UCAlarm>(uri, 0, 1, "Alarm");
-    qmlRegisterType<UCAlarmModel>(uri, 0, 1, "AlarmModel");
-    qmlRegisterType<UCStateSaver>(uri, 0, 1, "StateSaver");
+    qmlRegisterType<UCAlarm>(uri, major, minor, "Alarm");
+    qmlRegisterType<UCAlarmModel>(uri, major, minor, "AlarmModel");
+    qmlRegisterType<UCStateSaver>(uri, major, minor, "StateSaver");
     qmlRegisterType<UCStateSaverAttached>();
-    qmlRegisterSingletonType<UCUriHandler>(uri, 0, 1, "UriHandler", registerUriHandler);
-    qmlRegisterType<UCMouse>(uri, 0, 1, "Mouse");
-    qmlRegisterType<UCInverseMouse>(uri, 0, 1, "InverseMouse");
+    qmlRegisterSingletonType<UCUriHandler>(uri, major, minor, "UriHandler", registerUriHandler);
+    qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
+    qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
     // register QML singletons
-    qmlRegisterSingletonType<QObject>(uri, 0, 1, "PickerPanel", registerPickerPanel);
+    qmlRegisterSingletonType<QObject>(uri, major, minor, "PickerPanel", registerPickerPanel);
+}
+
+void UbuntuComponentsPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
+
+    // register 0.1 for backward compatibility
+    registerTypesToVersion(uri, 0, 1);
+    registerTypesToVersion(uri, 1, 0);
 
     // register custom event
     ForwardedEvent::registerForwardedEvent();
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.h'
--- modules/Ubuntu/Components/plugin/plugin.h	2014-01-27 13:39:55 +0000
+++ modules/Ubuntu/Components/plugin/plugin.h	2014-04-23 09:21:19 +0000
@@ -38,6 +38,9 @@
 private Q_SLOTS:
     void registerWindowContextProperty();
     void setWindowContextProperty(QWindow* focusWindow);
+
+private:
+    void registerTypesToVersion(const char *uri, int major, int minor);
 };
 #endif // UBUNTU_COMPONENTS_PLUGIN_H
 
 
=== modified file 'modules/Ubuntu/Components/plugin/qquickclipboard.cpp'
--- modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2013-01-28 17:59:39 +0000
+++ modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2014-04-23 09:21:19 +0000
@@ -26,7 +26,7 @@
 /*!
  * \qmltype Clipboard
  * \instantiates QQuickClipboard
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief This is a singleton type providing access to the system clipboard.
  *
 
=== modified file 'modules/Ubuntu/Components/plugin/qquickmimedata.cpp'
--- modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-23 09:21:19 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype MimeData
  * \instantiates QQuickMimeData
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief MimeData type provides interface to access and store data to the
  * Clipboard.
 
=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-10 09:48:30 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-23 09:21:19 +0000
@@ -219,7 +219,7 @@
 /*!
  * \qmltype Alarm
  * \instantiates UCAlarm
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu-services
  * \brief Alarm component is a representation of an alarm event.
  *
@@ -237,7 +237,7 @@
  * Example usage:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 0.1
+ * import Ubuntu.Components 1.0
  *
  * Rectangle {
  *     width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-04-23 09:21:19 +0000
@@ -25,7 +25,7 @@
 /*!
  * \qmltype AlarmModel
  * \instantiates UCAlarmModel
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu-services
  * \brief AlarmModel holds the list of alarms defined.
  *
@@ -39,8 +39,8 @@
  * Example usage:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 0.1
- * import Ubuntu.Components.ListItems 0.1
+ * import Ubuntu.Components 1.0
+ * import Ubuntu.Components.ListItems 1.0
  * ListView {
  *     model: AlarmModel {}
  *     width: units.gu(80)
 
=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp'
--- modules/Ubuntu/Components/plugin/ucapplication.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-04-23 09:21:19 +0000
@@ -27,7 +27,7 @@
 /*!
  * \qmltype UbuntuApplication
  * \instantiates UCApplication
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication.
  *
 
=== modified file 'modules/Ubuntu/Components/plugin/ucargument.cpp'
--- modules/Ubuntu/Components/plugin/ucargument.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucargument.cpp	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype Argument
  * \instantiates UCArgument
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu-commandline
  * \brief The Argument class specifies what type a given command line parameter should be.
  *
 
=== modified file 'modules/Ubuntu/Components/plugin/ucarguments.cpp'
--- modules/Ubuntu/Components/plugin/ucarguments.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucarguments.cpp	2014-04-23 09:21:19 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype Arguments
  * \instantiates UCArguments
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu-commandline
  * \brief The Arguments class provides a way to declare what command line
  *        parameters are expected by the application.
 
=== modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp'
--- modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype FontUtils
  * \instantiates UCFontUtils
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
  * which provides utility functions for font manipulations.
@@ -34,7 +34,7 @@
  * size:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 0.1
+ * import Ubuntu.Components 1.0
  *
  * Text {
  *     property string fontSize: "medium"
@@ -46,7 +46,7 @@
  * font unit size to scale its font:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 0.1
+ * import Ubuntu.Components 1.0
  *
  * TextInput {
  *     property string fontSize: "small"
 
=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-15 12:51:31 +0000
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-23 09:21:19 +0000
@@ -59,7 +59,7 @@
 /*!
    \qmltype Mouse
    \instantiates UCMouse
-   \inqmlmodule Ubuntu.Components 0.1
+   \inqmlmodule Ubuntu.Components 1.0
    \ingroup ubuntu
    \brief Attached property filtering mouse events occured inside the owner.
 
@@ -97,7 +97,7 @@
    released mouse buttons would look as follows:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    TextInput {
        width: 100
@@ -119,7 +119,7 @@
    Example of handling right button clicks over a TextInput:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    TextInput {
        width: 100
@@ -141,7 +141,7 @@
 
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    TextInput {
        width: 100
@@ -201,7 +201,7 @@
    will be printed as well as the proxied mouse press from the main item.
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    Item {
        id: main
@@ -254,7 +254,7 @@
    will be blocked by the MouseArea still.
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    MouseArea {
        id: topArea
@@ -289,7 +289,7 @@
    we make sure the TextInput always receives the events before the filter:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    TextInput {
        id: input
@@ -316,7 +316,7 @@
 
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 0.1
+   import Ubuntu.Components 1.0
 
    TextInput {
        width: units.gu(40)
@@ -954,7 +954,7 @@
 /*!
    \qmltype InverseMouse
    \instantiates UCInverseMouse
-   \inqmlmodule Ubuntu.Components 0.1
+   \inqmlmodule Ubuntu.Components 1.0
    \ingroup ubuntu
    \brief Attached object filtering mouse events occured outside the owner.
 
 
=== modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-02-05 19:23:35 +0000
+++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-04-23 09:21:19 +0000
@@ -140,7 +140,7 @@
 /*!
  * \qmltype StateSaver
  * \instantiates UCStateSaverAttached
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu-services
  * \brief Attached propertyes to save component property states.
  *
@@ -158,7 +158,7 @@
  * Example:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 0.1
+ * import Ubuntu.Components 1.0
  *
  * TextField {
  *     id: input
 
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-01-27 09:14:31 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-23 09:21:19 +0000
@@ -36,7 +36,7 @@
 /*!
     \qmltype Theme
     \instantiates UCTheme
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup theming
     \brief The Theme class provides facilities to interact with the current theme.
 
@@ -48,7 +48,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Item {
         Button {
@@ -61,7 +61,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     StyledItem {
         id: myItem
 
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2013-07-11 15:14:38 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype UbuntuAnimation
  * \instantiates UCUbuntuAnimation
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief Singleton defining standard Ubuntu durations and easing for animations
  *        that should be used to ensure that Ubuntu applications are consistent
 
=== modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp'
--- modules/Ubuntu/Components/plugin/ucunits.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-23 09:21:19 +0000
@@ -40,7 +40,7 @@
 /*!
     \qmltype Units
     \instantiates UCUnits
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.0
     \ingroup resolution-independence
     \brief Units of measurement for sizes, spacing, margin, etc.
 
@@ -52,7 +52,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.0
 
     Item {
         width: units.gu(2)
 
=== modified file 'modules/Ubuntu/Components/plugin/ucurihandler.cpp'
--- modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-02-13 09:55:51 +0000
+++ modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-04-23 09:21:19 +0000
@@ -36,7 +36,7 @@
 /*!
  * \qmltype UriHandler
  * \instantiates UCUriHandler
- * \inqmlmodule Ubuntu.Components 0.1
+ * \inqmlmodule Ubuntu.Components 1.0
  * \ingroup ubuntu
  * \brief Singleton signalling for opened URIs.
  *
 
=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-02-13 11:48:38 +0000
+++ modules/Ubuntu/Components/qmldir	2014-04-23 09:21:19 +0000
@@ -47,3 +47,44 @@
 
 internal TextCursor TextCursor.qml
 internal TextInputPopover TextInputPopover.qml
+
+#version 1.0
+Action 1.0 Action.qml
+ActionItem 1.0 ActionItem.qml
+ActionList 1.0 ActionList.qml
+ToolbarItems 1.0 ToolbarItems.qml
+ToolbarButton 1.0 ToolbarButton.qml
+MainView 1.0 MainView.qml
+Button 1.0 Button.qml
+Panel 1.0 Panel.qml
+Tab 1.0 Tab.qml
+TabBar 1.0 TabBar.qml
+Tabs 1.0 Tabs.qml
+Label 1.0 Label.qml
+AbstractButton 1.0 AbstractButton.qml
+ActivityIndicator 1.0 ActivityIndicator.qml
+ProgressBar 1.0 ProgressBar.qml
+TextField 1.0 TextField.qml
+TextArea 1.0 TextArea.qml
+Switch 1.0 Switch.qml
+CheckBox 1.0 CheckBox.qml
+Slider 1.0 Slider.qml
+Scrollbar 1.0 Scrollbar.qml
+Object 1.0 Object.qml
+OptionSelector 1.0 OptionSelector.qml
+OptionSelectorDelegate 1.0 OptionSelectorDelegate.qml
+Page 1.0 Page.qml
+PageStack 1.0 PageStack.qml
+Header 1.0 Header.qml
+UbuntuShape 1.0 UbuntuShape.qml
+CrossFadeImage 1.0 CrossFadeImage.qml
+Icon 1.0 Icon.qml
+OrientationHelper 1.0 OrientationHelper.qml
+MathUtils 1.0 mathUtils.js
+SliderUtils 1.0 sliderUtils.js
+ScrollbarUtils 1.0 scrollbarUtils.js
+UbuntuNumberAnimation 1.0 UbuntuNumberAnimation.qml
+StyledItem 1.0 StyledItem.qml
+ColorUtils 1.0 colorUtils.js
+DateUtils 1.0 dateUtils.js
+UbuntuListView 1.0 UbuntuListView.qml
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp'
--- modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp	2013-06-25 13:42:22 +0000
+++ modules/Ubuntu/Layouts/plugin/ulconditionallayout.cpp	2014-04-23 09:21:19 +0000
@@ -41,7 +41,7 @@
 /*!
  * \qmltype ConditionalLayout
  * \instantiates ULConditionalLayout
- * \inqmlmodule Ubuntu.Layouts 0.1
+ * \inqmlmodule Ubuntu.Layouts 1.0
  * \ingroup ubuntu-layouts
  * \brief ConditionalLayout defines the layout of a given form factor.
  *
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp'
--- modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp	2013-06-25 13:42:22 +0000
+++ modules/Ubuntu/Layouts/plugin/ulitemlayout.cpp	2014-04-23 09:21:19 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype ItemLayout
  * \instantiates ULItemLayout
- * \inqmlmodule Ubuntu.Layouts 0.1
+ * \inqmlmodule Ubuntu.Layouts 1.0
  * \ingroup ubuntu-layouts
  * \brief ItemLayout defines a new size & position of a single Item, for the purposes
  * of specifying layouts. This is to be used within a ConditionalLayout definition.
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.cpp'
--- modules/Ubuntu/Layouts/plugin/ullayouts.cpp	2014-02-18 13:27:23 +0000
+++ modules/Ubuntu/Layouts/plugin/ullayouts.cpp	2014-04-23 09:21:19 +0000
@@ -379,7 +379,7 @@
 /*!
  * \qmltype Layouts
  * \instantiates ULLayouts
- * \inqmlmodule Ubuntu.Layouts 0.1
+ * \inqmlmodule Ubuntu.Layouts 1.0
  * \ingroup ubuntu-layouts
  * \brief The Layouts component allows one to specify multiple different layouts for a
  * fixed set of Items, and applies the desired layout to those Items.
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulplugin.cpp'
--- modules/Ubuntu/Layouts/plugin/ulplugin.cpp	2013-06-06 16:00:10 +0000
+++ modules/Ubuntu/Layouts/plugin/ulplugin.cpp	2014-04-23 09:21:19 +0000
@@ -23,10 +23,16 @@
 
 #include <qqml.h>
 
+void PluginPlugin::registerTypeVersions(const char *uri, int major, int minor)
+{
+    qmlRegisterType<ULLayouts>(uri, major, minor, "Layouts");
+    qmlRegisterType<ULConditionalLayout>(uri, major, minor, "ConditionalLayout");
+    qmlRegisterType<ULItemLayout>(uri, major, minor, "ItemLayout");
+}
+
 void PluginPlugin::registerTypes(const char *uri)
 {
     // @uri Ubuntu.Layouts
-    qmlRegisterType<ULLayouts>(uri, 0, 1, "Layouts");
-    qmlRegisterType<ULConditionalLayout>(uri, 0, 1, "ConditionalLayout");
-    qmlRegisterType<ULItemLayout>(uri, 0, 1, "ItemLayout");
+    registerTypeVersions(uri, 0, 1);
+    registerTypeVersions(uri, 1, 0);
 }
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulplugin.h'
--- modules/Ubuntu/Layouts/plugin/ulplugin.h	2013-05-29 09:41:20 +0000
+++ modules/Ubuntu/Layouts/plugin/ulplugin.h	2014-04-23 09:21:19 +0000
@@ -28,6 +28,8 @@
     
 public:
     void registerTypes(const char *uri);
+private:
+    void registerTypeVersions(const char *uri, int major, int minor);
 };
 
 #endif // PLUGIN_PLUGIN_H
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml'
--- modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-02-02 19:54:17 +0000
+++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-23 09:21:19 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.PerformanceMetrics 0.1 as PerformanceMetrics
+import Ubuntu.Components 1.0
+import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
 
 Item {
     id: graph
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml'
--- modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml	2014-02-12 17:38:29 +0000
+++ modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml	2014-04-23 09:21:19 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.PerformanceMetrics 0.1 as PerformanceMetrics
+import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
 
 /*!
     \qmltype PerformanceOverlay
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp'
--- modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp	2014-02-11 17:40:02 +0000
+++ modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.cpp	2014-04-23 09:21:19 +0000
@@ -26,14 +26,19 @@
 #include <QtQml/QQmlContext>
 #include "upmrenderingtimes.h"
 
+void UbuntuPerformanceMetricsPlugin::registerTypeVersion(const char *uri, int major, int minor)
+{
+    qmlRegisterType<UPMRenderingTimes>(uri, major, minor, "RenderingTimes");
+    qmlRegisterType<UPMCpuUsage>(uri, major, minor, "CpuUsage");
+    qmlRegisterType<UPMTextureFromImage>(uri, major, minor, "TextureFromImage");
+    qmlRegisterType<UPMGraphModel>();
+}
+
 void UbuntuPerformanceMetricsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.PerformanceMetrics"));
-
-    qmlRegisterType<UPMRenderingTimes>(uri, 0, 1, "RenderingTimes");
-    qmlRegisterType<UPMCpuUsage>(uri, 0, 1, "CpuUsage");
-    qmlRegisterType<UPMTextureFromImage>(uri, 0, 1, "TextureFromImage");
-    qmlRegisterType<UPMGraphModel>();
+    registerTypeVersion(uri, 0, 1);
+    registerTypeVersion(uri, 1, 0);
 }
 
 void UbuntuPerformanceMetricsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h'
--- modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h	2014-02-11 13:23:46 +0000
+++ modules/Ubuntu/PerformanceMetrics/plugin/upmplugin.h	2014-04-23 09:21:19 +0000
@@ -29,6 +29,8 @@
 public:
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
+private:
+    void registerTypeVersion(const char *uri, int major, int minor);
 };
 
 #endif // UBUNTU_PERFORMANCE_METRICS_PLUGIN_H
 
=== modified file 'modules/Ubuntu/PerformanceMetrics/qmldir'
--- modules/Ubuntu/PerformanceMetrics/qmldir	2014-01-21 18:27:23 +0000
+++ modules/Ubuntu/PerformanceMetrics/qmldir	2014-04-23 09:21:19 +0000
@@ -3,3 +3,6 @@
 
 PerformanceOverlay 0.1 PerformanceOverlay.qml
 internal BarGraph BarGraph.qml
+
+#version 1.0
+PerformanceOverlay 1.0 PerformanceOverlay.qml
 
=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-09 12:37:19 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-23 09:21:19 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 /*!
     \qmlabstract UbuntuTestCase
 
=== modified file 'modules/Ubuntu/Test/qmldir'
--- modules/Ubuntu/Test/qmldir	2013-07-24 12:34:45 +0000
+++ modules/Ubuntu/Test/qmldir	2014-04-23 09:21:19 +0000
@@ -1,1 +1,5 @@
+module Ubuntu.Test
 UbuntuTestCase 0.1 UbuntuTestCase.qml
+
+#version 1.0
+UbuntuTestCase 1.0 UbuntuTestCase.qml
 
=== modified file 'run_tests.sh'
--- run_tests.sh	2014-03-03 08:37:42 +0000
+++ run_tests.sh	2014-04-23 09:21:19 +0000
@@ -15,15 +15,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+source $PWD/export_modules_dir.sh
+
 cd tests/autopilot
 
 echo running with arg: $1
 
 UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1
 if [ "$1" == "" ]; then
-	python3 -m autopilot.run run ubuntuuitoolkit
+        autopilot3 run ubuntuuitoolkit
 else
-	python3 -m autopilot.run run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
+        autopilot3 run -o ../../$1 -f xml -r -rd ../../ $1
 fi
 
 exit 0
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-03-10 22:04:01 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-23 09:21:19 +0000
@@ -25,7 +25,7 @@
 
 DEFAULT_QML_FILE_CONTENTS = ("""
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 MainView {
     width: units.gu(48)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-02-12 09:20:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-23 09:21:19 +0000
@@ -65,7 +65,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 MainView {
     width: units.gu(48)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-15 13:15:36 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-23 09:21:19 +0000
@@ -72,7 +72,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 MainView {