Merge lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fixes TextField and TextArea selection and scrolling behaviors.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:994
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1990/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/47
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4543/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/938/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/938
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/938/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5667
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4661/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:996
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1993/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/56
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4559/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/941/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/941
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/941/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4160
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5686
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4677/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:996
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1995/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/61
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/943/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/943
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/943/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5694
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4685/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:997
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2000/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/77
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/948/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5724
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4715/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2002/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/79
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4593/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/950/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/950
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4188
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5726
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4717/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1001
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2009/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4739/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1005
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2014/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/122
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/962/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/962
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5803
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4786/console

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

I see the same test failure here as J locally.
> tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)
> tryCompare(moveSpy, "count", 1, 200);
Why not moveSpy.wait(); here? That seems to fix it for me.

When using select and context menu a few times it's possible to change the selection after the menu opens but before letting go of the mouse button. So I don't get what I selected or worst case nothing.

What I manually checked is that I can select, including scrolling, get a menu, copy, paste and so on, double click to select a word, all of these seem sold aside from the above issue.

FTR toggleFlickablesInteractive looks rather hackish… I guess Repeater doesn't support it, and PropertyChanges doesn't take a list either… but let's have it as-is for now.

Should maybe selectionTimeout.interval be added to modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml:31

test_press_and_hold_over_selected_text etc. doesn't test the context menu. Especially given the above problem I found while using it, I think we need to test that it can be clicked and catches the right text. Possibly AP.

review: Needs Fixing

[Zsombor Egri (zsombi)]

> I see the same test failure here as J locally.
> > tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)
> > tryCompare(moveSpy, "count", 1, 200);
> Why not moveSpy.wait(); here? That seems to fix it for me.

Ahh, right :) I'll fix it.

>
> When using select and context menu a few times it's possible to change the
> selection after the menu opens but before letting go of the mouse button. So I
> don't get what I selected or worst case nothing.

Let's do this in a separate branch..

>
> What I manually checked is that I can select, including scrolling, get a menu,
> copy, paste and so on, double click to select a word, all of these seem sold
> aside from the above issue.
>
> FTR toggleFlickablesInteractive looks rather hackish… I guess Repeater doesn't
> support it, and PropertyChanges doesn't take a list either… but let's have it
> as-is for now.

Well, limitation of PropertyChange, maybe we propose some Change component upstream to deal with a list of targets :).

>
> Should maybe selectionTimeout.interval be added to
> modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml:31

I will put this in the TextFieldStyle/TextAreaStyle components rather than the cursor style.

>
> test_press_and_hold_over_selected_text etc. doesn't test the context menu.
> Especially given the above problem I found while using it, I think we need to
> test that it can be clicked and catches the right text. Possibly AP.

Yep, but let's get this in a separate branch as well.

[Cris Dywan (kalikiana)]

Filed bug 1304952 for testing the context menu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1008
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2016/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/129
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/964
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5820
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4802
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4802/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1012
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/162
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4304
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5875
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4850
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4850/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/3/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4311
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5883
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4857
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4857/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/5/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

The menu now stays in place the way it should. Nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1015
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/174
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5893
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4867
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4867/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/10/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-autolanding/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-autolanding/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-autolanding/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-autolanding/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4873
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4873/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1019
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/243
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4838/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/23/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6036
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4975/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1021. By Zsombor Egri on 2014-04-15

cleanup

1022. By Zsombor Egri on 2014-04-15

more cleanup

[Cris Dywan (kalikiana)]

Seems to work fine, albeit I get a weird error message now:
QIODevice::write: device not open

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/249
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4848/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/27/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4424
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6048
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4985/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1022
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/253
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4855/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/29/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/29/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/29/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4430
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6056
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4993/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1023. By Zsombor Egri on 2014-04-16

staging merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1023
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/259
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4862/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/32/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4440
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6081
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5005/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1024. By Zsombor Egri on 2014-04-17

staging merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1024
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/310
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4925/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/43/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/43/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/43/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6164
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5078/console

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

FAIL! : components::TextAreaInFlickableAPI::test_DoNotStealFlickEvents() 'wait for signal onMovementEnded' returned FALSE. ()
   Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.46+14.04.20140408.1bzr1024pkg0trusty43/tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)]

review: Needs Fixing

[Cris Dywan (kalikiana)]

FAIL! : components::TextAreaInFlickableAPI::test_DoNotStealFlickEvents() 'wait for signal onMovementEnded' returned FALSE. ()
   Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.46+14.04.20140408.1bzr1024pkg0trusty43/tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)]

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1025. By Zsombor Egri on 2014-04-20

replace flick() with mouseDrag()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1025
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4961
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/55/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/55/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/55/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4559
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4559/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5132
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5132/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/55/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1026. By Zsombor Egri on 2014-04-20

change flick() with mouseDrag()

1027. By Zsombor Egri on 2014-04-23

versioning merge

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1026
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5155
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5155/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/60/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1026
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4973
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/58/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4577
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5148/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/58/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection]

1028. By Zsombor Egri on 2014-04-24

tests reworked for tst_textarea_in_flickable.qml

1029. By Zsombor Egri on 2014-04-24

staging merge

1030. By Zsombor Egri on 2014-04-25

staging merge

Unmerged revisions

=== modified file 'CHANGES'
--- CHANGES	2014-04-16 11:51:47 +0000
+++ CHANGES	2014-04-23 10:12:48 +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 10:12:48 +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,241 +610,477 @@
     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()
-    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/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()
+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/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)
+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)
 modules/Ubuntu/Components/Themes/Palette.qml
 QtObject
     property PaletteValues normal
@@ -566,28 +1099,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 +1164,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 +1172,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 +1187,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 +1210,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 +1227,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 +1240,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 +1285,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 +1295,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 +1312,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 +1322,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 +1355,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 +1373,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 +1385,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 +1395,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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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.
 

=== added file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2014-04-23 10:12:48 +0000
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1 as Ubuntu
+
+/*
+  This component is a unified text selection and scrolling handler for both
+  TextField and TextArea components.
+  */
+
+Item {
+    id: inputHandler
+    objectName: "input_handler"
+    // the root control
+    property Item main
+    // the input instance
+    property Item input
+    // the Flickable holdiong the input instance
+    property Flickable flickable
+    // selection cursor mode
+    property bool selectionCursor: input && input.selectedText !== ""
+    // True if mouse handlig is enabled, false if flicking mode is enabled
+    readonly property bool mouseHandlingEnabled: !flickable.interactive
+    // property holding the selection mode timeout
+    property int selectionModeTimeout: 200
+
+    // signal triggered when popup shoudl be opened
+    signal pressAndHold(int pos)
+
+    function activateInput() {
+        if (!input.activeFocus) {
+            input.forceActiveFocus();
+        } else {
+            showInputPanel();
+        }
+    }
+
+    function showInputPanel() {
+        if (!Qt.inputMethod.visible) {
+            Qt.inputMethod.show();
+        }
+        textChanged = false;
+    }
+    function hideInputPanel() {
+        Qt.inputMethod.hide();
+        // emit accepted signal if changed
+        if (textChanged && input.hasOwnProperty("accepted")) {
+            input.accepted();
+        }
+    }
+
+    // internal properties/functions
+    readonly property bool singleLine: input && input.hasOwnProperty("validator")
+    property var flickableList: new Array()
+    property bool textChanged: false
+    property int pressedPosition: -1
+    // move properties
+    property int moveStarts: -1
+    property int moveEnds: -1
+    // set scroller to the first Flickable that scrolls the input
+    // this can be the internal Flickable if the full autosize is disabled
+    // or one of the input's parent Flickable
+    readonly property bool scrollingDisabled: main && main.hasOwnProperty("autoSize") ?
+                                                  (main.autoSize && (main.maximumLineCount <= 0)) : false
+    onScrollingDisabledChanged: if (state == "") flickable.interactive = !scrollingDisabled
+    readonly property Flickable grandScroller: firstFlickableParent(main)
+    readonly property Flickable scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
+
+    // ensures the text cusrorRectangle is always in the internal Flickable's visible area
+    function ensureVisible()
+    {
+        var rect = input.cursorRectangle;
+        if (flickable.moving || flickable.flicking)
+            return;
+        if (flickable.contentX >= rect.x)
+            flickable.contentX = rect.x;
+        else if (flickable.contentX + flickable.width <= rect.x + rect.width)
+            flickable.contentX = rect.x + rect.width - flickable.width;
+        if (flickable.contentY >= rect.y)
+            flickable.contentY = rect.y;
+        else if (flickable.contentY + flickable.height <= rect.y + rect.height)
+            flickable.contentY = rect.y + rect.height - flickable.height;
+    }
+    // returns the mouse position
+    function mousePosition(mouse) {
+        return singleLine ? input.positionAt(mouse.x) : input.positionAt(mouse.x, mouse.y);
+    }
+    // checks whether the position is in the selected text
+    function positionInSelection(pos) {
+        return (input.selectionStart !== input.selectionEnd)
+                && (pos >= Math.min(input.selectionStart, input.selectionEnd))
+                && (pos <= Math.max(input.selectionStart, input.selectionEnd));
+    }
+
+    // check whether the mouse is inside a selected text area
+    function mouseInSelection(mouse) {
+        var pos = mousePosition(mouse);
+        return positionInSelection(pos);
+    }
+    // selects text
+    function selectText(mouse) {
+        moveEnds = mousePosition(mouse);
+        if (moveStarts < 0) {
+            moveStarts = moveEnds;
+        }
+        input.select(moveStarts, moveEnds);
+    }
+    // returns the first Flickable parent of a given item
+    function firstFlickableParent(item) {
+        var p = item ? item.parent : null;
+        while (p && !p.hasOwnProperty("flicking")) {
+            p = p.parent;
+        }
+        return p;
+    }
+    // focuses the input if not yet focused, and shows the context menu
+    function openContextMenu(mouse) {
+        var pos = mousePosition(mouse);
+        if (!main.focus || !mouseInSelection(mouse)) {
+            activateInput();
+            input.cursorPosition = pressedPosition = mousePosition(mouse);
+        }
+        // open context menu at the cursor position
+        inputHandler.pressAndHold(input.cursorPosition);
+        // if opened with left press (touch falls into this criteria as well), we need to set state to inactive
+        // so the mouse moves won't result in selected text loss/change
+        if (mouse.button === Qt.LeftButton) {
+            state = "inactive";
+        }
+    }
+
+    // disables interactive Flickable parents, stops at the first non-interactive flickable.
+    function toggleFlickablesInteractive(turnOn) {
+        var p;
+        if (!turnOn) {
+            // handle the scroller separately
+            p = firstFlickableParent(scroller)
+            while (p) {
+                if (p.interactive) {
+                    flickableList.push(p);
+                    p.interactive = false;
+                } else {
+                    break;
+                }
+                p = firstFlickableParent(p);
+            }
+        } else {
+            while (flickableList.length > 0) {
+                p = flickableList.pop();
+                p.interactive = true;
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        state = (main.focus) ? "" : "inactive";
+    }
+
+    // states
+    states: [
+        // override default state to turn on the saved Flickable interactive mode
+        State {
+            name: ""
+            StateChangeScript {
+                // restore interactive for all Flickable parents
+                script: toggleFlickablesInteractive(true);
+            }
+        },
+        State {
+            name: "inactive"
+            // we do not disable scroller here as in case the internal scrolling
+            // is disabled (scrollingDisabled = true) the outer scroller (grandScroller)
+            // would be blocked as well, which we don't want to
+            PropertyChanges {
+                target: flickable
+                interactive: false
+            }
+        },
+        State {
+            name: "scrolling"
+            StateChangeScript {
+                script: {
+                    // stop scrolling all the parents
+                    toggleFlickablesInteractive(false);
+                    // stop selection timeout
+                    selectionTimeout.running = false;
+                }
+            }
+        },
+        State {
+            name: "select"
+            // during select state all the flickables are blocked (interactive = false)
+            // we can use scroller here as we need to disable the outer scroller too!
+            PropertyChanges {
+                target: scroller
+                interactive: false
+            }
+            StateChangeScript {
+                script: {
+                    // turn off interactive for all parent flickables
+                    toggleFlickablesInteractive(false);
+                    if (!positionInSelection(pressedPosition)) {
+                        input.cursorPosition = pressedPosition;
+                    }
+                }
+            }
+        }
+    ]
+
+    // brings the state back to default when the component looses focuse
+    Connections {
+        target: main
+        ignoreUnknownSignals: true
+        onFocusChanged: {
+            state = (main.focus) ? "" : "inactive";
+        }
+    }
+
+    // input specific signals
+    Connections {
+        target: input
+        onCursorRectangleChanged: if (!scrollingDisabled) ensureVisible()
+        onTextChanged: textChanged = true;
+    }
+
+    // inner or outer Flickable controlling
+    Connections {
+        target: scroller
+        // turn scrolling state on
+        onFlickStarted: if (!scrollingDisabled) state = "scrolling"
+        onMovementStarted: if (!scrollingDisabled) state = "scrolling"
+        // reset to default state
+        onMovementEnded: state = ""
+    }
+
+    // switches the state to selection
+    Timer {
+        id: selectionTimeout
+        interval: selectionModeTimeout
+        onTriggered: {
+            if (scroller && !scroller.moving) {
+                state = "select";
+            }
+        }
+    }
+
+    // Mouse handling
+    Ubuntu.Mouse.forwardTo: [main]
+    Ubuntu.Mouse.onPressed: {
+        if (input.activeFocus) {
+            // start selection timeout
+            selectionTimeout.restart();
+        }
+        // remember pressed position as we need it when entering into selection state
+        pressedPosition = mousePosition(mouse);
+        // consume event so it does not get forwarded to the input
+        mouse.accepted = true;
+    }
+    Ubuntu.Mouse.onReleased: {
+        if (!main.focus && !main.activeFocusOnPress) {
+            return;
+        }
+
+        activateInput();
+        // stop text selection timer
+        selectionTimeout.running = false;
+        if (state === "") {
+            input.cursorPosition = mousePosition(mouse);
+        }
+        moveStarts = moveEnds = -1;
+        state = "";
+    }
+    Ubuntu.Mouse.onPositionChanged: {
+        // leave if not focus, not the left button or not in select state
+        if (!input.activeFocus || (mouse.button !== Qt.LeftButton) || (state !== "select") || !main.selectByMouse) {
+            return;
+        }
+        // stop text selection timer
+        selectionTimeout.running = false;
+        selectText(mouse);
+    }
+    Ubuntu.Mouse.onDoubleClicked: {
+        if (main.selectByMouse) {
+            input.selectWord();
+            // turn selection state temporarily so the selection is not cleared on release
+            state = "selection";
+        }
+    }
+    Ubuntu.Mouse.onPressAndHold: openContextMenu(mouse)
+
+}

=== 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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +0000
@@ -15,11 +15,12 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 0.1 as Ubuntu
 import "mathUtils.js" as MathUtils
 
 /*!
     \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.
@@ -60,19 +61,34 @@
     mode and 4 lines on fixed-mode. The line size is calculated from the font size and the
     ovarlay and frame spacing specified in the style.
 
+    \section2 Scrolling and text selection
+    The input is activated when the tap or mouse is released after being pressed
+    over the component.
+
     Scrolling the editing area can happen when the size is fixed or in auto-sizing mode when
     the content size is bigger than the visible area. The scrolling is realized by swipe
     gestures, or by navigating the cursor.
 
-    The item enters in selection mode when the user performs a long tap (or long mouse press)
-    or a double tap/press on the text area. The mode is visualized by two selection cursors
-    (pins) which can be used to select the desired text. The text can also be selected by
-    moving the finger/mouse towards the desired area right after entering in selection mode.
-    The way the text is selected is driven by the mouseSelectionMode value, which is either
-    character or word. The editor leaves the selection mode by pressing/tapping again on it
-    or by losing focus.
-
-    \b{This component is under heavy development.}
+    The content can be selected in the following ways:
+    \list
+    \li - double tapping/left mouse clicking over the content, when the word that
+          had been tapped over will be selected
+    \li - by pressing and dragging the selection cursor over the text input. Note
+          that there has to be a delay of approx. 200 ms between the press and drag
+          gesture, time when the input switches from scroll mode to selection mode
+    \endlist
+
+    The input is focused (activated) upon tap/left mouse button release. The cursor
+    will be placed at the position the mouse/tap point at release time. If the click
+    is happening on a selected area, the selection will be cleared. Long press above
+    a selected area brings up the clipboard context menu. When the long press happens
+    over a non-selected area, the cursor will be moved to the position and the component
+    enters in selection mode. The selection mode can also be activated by tapping and
+    keeping the tap/mouse over for approx 300 ms. If there is a move during this time,
+    the component enters into scrolling mode. The mode is exited once the scrolling
+    finishes. During the scrolling mode the selected text is preserved.
+
+    \note During text selection all interactive parent Flickables are turned off.
   */
 
 StyledItem {
@@ -708,7 +724,7 @@
     */
     function forceActiveFocus()
     {
-        internal.activateEditor();
+        inputHandler.activateInput();
     }
 
     // logic
@@ -721,6 +737,13 @@
     // activation area on mouse click
     // the editor activates automatically when pressed in the editor control,
     // however that one can be slightly spaced to the main control area
+    MouseArea {
+        anchors.fill: parent
+        enabled: internal.frameSpacing > 0
+        // activate input when pressed on the frame
+        preventStealing: false
+        Ubuntu.Mouse.forwardTo: [inputHandler]
+    }
 
     //internals
 
@@ -744,8 +767,6 @@
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
-    /*!\internal */
-    property alias __internal: internal
     QtObject {
         id: internal
         // public property locals enabling aliasing
@@ -757,23 +778,8 @@
         property real inputAreaWidth: control.width - 2 * frameSpacing
         property real inputAreaHeight: control.height - 2 * frameSpacing
         //selection properties
-        property bool draggingMode: false
-        property bool selectionMode: false
         property bool prevShowCursor
 
-        signal popupTriggered(int pos)
-
-        onDraggingModeChanged: {
-            if (draggingMode) selectionMode = false;
-        }
-        onSelectionModeChanged: {
-            if (selectionMode)
-                draggingMode = false;
-            else {
-                toggleSelectionCursors(false);
-            }
-        }
-
         function toggleSelectionCursors(show)
         {
             if (!show) {
@@ -788,25 +794,6 @@
             }
         }
 
-        function activateEditor()
-        {
-            if (!editor.activeFocus)
-                editor.forceActiveFocus();
-            else
-                showInputPanel();
-
-        }
-
-        function showInputPanel()
-        {
-            if (!Qt.inputMethod.visible)
-                Qt.inputMethod.show();
-        }
-        function hideInputPanel()
-        {
-            Qt.inputMethod.hide();
-        }
-
         function linesHeight(lines)
         {
             var lineHeight = editor.font.pixelSize * lines + lineSpacing * lines
@@ -822,24 +809,6 @@
                 control.height = linesHeight(MathUtils.clamp(control.lineCount, 1, max));
             }
         }
-
-        function enterSelectionMode(x, y)
-        {
-            if (undefined !== x && undefined !== y) {
-                control.cursorPosition = control.positionAt(x, y);
-                control.moveCursorSelection(control.cursorPosition + 1);
-            }
-            toggleSelectionCursors(true);
-        }
-
-        function positionCursor(x, y) {
-            var cursorPos = control.positionAt(x, y);
-            if (control.selectedText === "")
-                control.cursorPosition = cursorPos;
-            else if (control.selectionStart > cursorPos || control.selectionEnd < cursorPos) {
-                control.cursorPosition = cursorPos;
-            }
-        }
     }
 
     // grab Enter/Return keys which may be stolen from parent components of TextArea
@@ -869,7 +838,7 @@
             popover: control.popover
             visible: editor.cursorVisible
 
-            Component.onCompleted: internal.popupTriggered.connect(cursorItem.openPopover)
+            Component.onCompleted: inputHandler.pressAndHold.connect(cursorItem.openPopover)
         }
     }
     // selection cursor loader
@@ -922,6 +891,7 @@
     }
     Flickable {
         id: flicker
+        objectName: "textarea_scroller"
         anchors {
             fill: parent
             margins: internal.frameSpacing
@@ -929,38 +899,23 @@
         clip: true
         contentWidth: editor.paintedWidth
         contentHeight: editor.paintedHeight
-        interactive: !autoSize || (autoSize && maximumLineCount > 0)
         // do not allow rebounding
         boundsBehavior: Flickable.StopAtBounds
-        pressDelay: 500
-
-        function ensureVisible(r)
-        {
-            if (moving || flicking)
-                return;
-            if (contentX >= r.x)
-                contentX = r.x;
-            else if (contentX+width <= r.x+r.width)
-                contentX = r.x+r.width-width;
-            if (contentY >= r.y)
-                contentY = r.y;
-            else if (contentY+height <= r.y+r.height)
-                contentY = r.y+r.height-height;
-        }
 
         // editor
         // Images are not shown when text contains <img> tags
         // bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27071
         TextEdit {
+            objectName: "textarea_input"
             readOnly: false
             id: editor
             focus: true
-            onCursorRectangleChanged: flicker.ensureVisible(cursorRectangle)
             width: internal.inputAreaWidth
             height: Math.max(internal.inputAreaHeight, editor.contentHeight)
             wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
             mouseSelectionMode: TextEdit.SelectWords
             selectByMouse: false
+            activeFocusOnPress: false
             cursorDelegate: cursor
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
@@ -972,55 +927,15 @@
             // autosize handling
             onLineCountChanged: internal.frameSize()
 
-            // remove selection when typing starts or input method start entering text
-            onInputMethodComposingChanged: {
-                if (inputMethodComposing)
-                    internal.selectionMode = false;
-            }
-            Keys.onPressed: {
-                if ((event.text !== ""))
-                    internal.selectionMode = false;
-            }
-            Keys.onReleased: {
-                // selection positioners are updated after the keypress
-                if (selectionStart == selectionEnd)
-                    internal.selectionMode = false;
-            }
-
-            // handling text selection
-            MouseArea {
-                id: handler
-                enabled: control.enabled && control.activeFocusOnPress
+            // input selection and navigation handling
+            Ubuntu.Mouse.forwardTo: [inputHandler]
+            InputHandler {
+                id: inputHandler
                 anchors.fill: parent
-                propagateComposedEvents: true
-
-                onPressed: {
-                    internal.activateEditor();
-                    internal.draggingMode = true;
-                }
-                onPressAndHold: {
-                    // move mode gets false if there was a mouse move after the press;
-                    // this is needed as Flickable will send a pressAndHold in case of
-                    // press -> move-pressed ->stop-and-hold-pressed gesture is performed
-                    if (!internal.draggingMode)
-                        return;
-                    internal.draggingMode = false;
-                    // open popup
-                    internal.positionCursor(mouse.x, mouse.y);
-                    internal.popupTriggered(editor.cursorPosition);
-                }
-                onReleased: {
-                    internal.draggingMode = false;
-                }
-                onDoubleClicked: {
-                    internal.activateEditor();
-                    if (control.selectByMouse)
-                        control.selectWord();
-                }
-                onClicked: {
-                    internal.activateEditor();
-                    internal.positionCursor(mouse.x, mouse.y);
-                }
+                main: control
+                input: editor
+                flickable: flicker
+                selectionModeTimeout: control.__styleInstance.selectionModeTimeout
             }
         }
     }

=== 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 10:12:48 +0000
@@ -16,10 +16,11 @@
 
 import QtQuick 2.0
 import Ubuntu.Unity.Action 1.1 as UnityActions
+import Ubuntu.Components 0.1 as Ubuntu
 
 /*!
     \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
@@ -70,6 +71,34 @@
         }
     }
     \endqml
+
+    \section2 Scrolling and text selection
+    The input is activated when the tap or mouse is released after being pressed
+    over the component.
+
+    The text can be scrolled horizontally by swiping over the content both when
+    the component is active or inactive.
+
+    The content can be selected in the following ways:
+    \list
+    \li - double tapping/left mouse clicking over the content, when the word that
+          had been tapped over will be selected
+    \li - by pressing and dragging the selection cursor over the text input. Note
+          that there has to be a delay of approx. 200 ms between the press and drag
+          gesture, time when the input switches from scroll mode to selection mode
+    \endlist
+
+    The input is focused (activated) upon tap/left mouse button release. The cursor
+    will be placed at the position the mouse/tap point at release time. If the click
+    is happening on a selected area, the selection will be cleared. Long press above
+    a selected area brings up the clipboard context menu. When the long press happens
+    over a non-selected area, the cursor will be moved to the position and the component
+    enters in selection mode. The selection mode can also be activated by tapping and
+    keeping the tap/mouse over for approx 300 ms. If there is a move during this time,
+    the component enters into scrolling mode. The mode is exited once the scrolling
+    finishes. During the scrolling mode the selected text is preserved.
+
+    \note During text selection all interactive parent Flickables are turned off.
 */
 
 ActionItem {
@@ -98,10 +127,11 @@
     property bool hasClearButton: true
 
     /*!
-      \preliminary
+      \deprecated
       Component to be shown and used instead of the default On Screen Keyboard.
     */
     property Component customSoftwareInputPanel
+    onCustomSoftwareInputPanelChanged: console.error("customSoftwareInputPanel property deprecated.")
 
     /*!
       The property overrides the default popover of the TextField. When set, the TextField
@@ -146,10 +176,8 @@
     /*!
       Whether the TextField should gain active focus on a mouse press. By default
       this is set to true.
-
-      \qmlproperty bool activeFocusOnPress
     */
-    property alias activeFocusOnPress: editor.activeFocusOnPress
+    property bool activeFocusOnPress: true
 
     /*!
       Whether the TextField should scroll when the text is longer than the width.
@@ -446,11 +474,8 @@
 
       If false, the user cannot use the mouse to select text, only can use it to
       focus the input.
-
-      \qmlproperty bool selectByMouse
-      \preliminary
     */
-    property alias selectByMouse: virtualKbdHandler.enabled
+    property bool selectByMouse: true
 
     /*!
       This read-only property provides the text currently selected in the text input.
@@ -504,7 +529,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
@@ -719,7 +744,7 @@
     */
     function forceActiveFocus()
     {
-        internal.activateEditor();
+        inputHandler.activateInput();
     }
 
     /*!
@@ -817,25 +842,20 @@
         anchors.fill: parent
         // us it only when there is space between the frame and input
         enabled: internal.spacing > 0
-        onClicked: internal.activateEditor()
+        preventStealing: false
+        // forward mouse events to input so we can handle those uniformly
+        Ubuntu.Mouse.forwardTo: [inputHandler]
     }
 
     Text { id: fontHolder }
 
     //internals
-    /*! \internal */
-    property alias __internal: internal
     QtObject {
         id: internal
         // array of borders in left, top, right, bottom order
-        property bool textChanged: false
         property real spacing: control.__styleInstance.overlaySpacing
         property real lineSpacing: units.dp(3)
         property real lineSize: editor.font.pixelSize + lineSpacing
-        //selection properties
-        property bool selectionMode: false
-
-        signal popupTriggered()
 
         property int type: action ? action.parameterType : 0
         onTypeChanged: {
@@ -847,54 +867,6 @@
              || type == UnityActions.Action.Real)
                 inputMethodHints = Qt.ImhDigitsOnly
         }
-
-        function activateEditor()
-        {
-            if (!editor.activeFocus)
-                editor.forceActiveFocus();
-            else
-                showInputPanel();
-        }
-
-        function showInputPanel()
-        {
-            if (control.customSoftwareInputPanel != undefined) {
-                // TODO implement once we have the SIP ready
-            } else {
-                if (!Qt.inputMethod.visible)
-                    Qt.inputMethod.show();
-            }
-            textChanged = false;
-        }
-        function hideInputPanel()
-        {
-            if (control.customSoftwareInputPanel != undefined) {
-                // TODO implement once we have the SIP ready
-            } else {
-                Qt.inputMethod.hide();
-            }
-            // emit accepted signal if changed
-            if (textChanged)
-                control.accepted();
-        }
-        // reset selection
-        function resetEditorSelection(mouseX)
-        {
-            editor.cursorPosition = editor.positionAt(mouseX);
-        }
-
-        // positions the cursor depending on whether there is a selection active or not
-        function positionCursor(x) {
-
-            var cursorPos = control.positionAt(x);
-            if (control.selectedText === "") {
-                control.cursorPosition = cursorPos;
-            }
-            // If target cursor position is outside selection then cancel selection and move cursor
-            else if (control.selectionStart > cursorPos || control.selectionEnd < cursorPos) {
-                control.cursorPosition = cursorPos;
-            }
-        }
     }
 
     //left pane
@@ -947,7 +919,7 @@
             popover: control.popover
             visible: editor.cursorVisible
 
-            Component.onCompleted: internal.popupTriggered.connect(openPopover)
+            Component.onCompleted: inputHandler.pressAndHold.connect(openPopover)
         }
     }
 
@@ -999,79 +971,55 @@
 
 
     // text input
-    TextInput {
-        id: editor
-        // FocusScope will forward focus to this component
-        focus: true
+    Flickable {
+        id: flicker
+        objectName: "textfield_scroller"
         anchors {
             left: leftPane.right
             right: clearButton.left
+            top: parent.top
+            bottom: parent.bottom
             margins: internal.spacing
-            verticalCenter: parent.verticalCenter
         }
-        // get the control's style
+        topMargin: internal.spacing
+        // do not allow rebounding
+        boundsBehavior: Flickable.StopAtBounds
+        // need to forward events as events occurred on topMargin area are not grabbed by the MouseArea.
+        Ubuntu.Mouse.forwardTo: [inputHandler]
+
         clip: true
-        onTextChanged: internal.textChanged = true
-        cursorDelegate: cursor
-        color: control.__styleInstance.color
-        selectedTextColor: Theme.palette.selected.foregroundText
-        selectionColor: Theme.palette.selected.foreground
-        font.pixelSize: FontUtils.sizeToPixels("medium")
-        passwordCharacter: "\u2022"
-        // forward keys to the root element so it can be captured outside of it
-        Keys.forwardTo: [control]
-
-        // handle virtual keyboard and cursor positioning, as the MouseArea overrides
-        // those functionalities of the TextInput
-        MouseArea {
-            id: virtualKbdHandler
-            anchors.fill: parent
-            hoverEnabled: true
-            preventStealing: true
-
-            onClicked: {
-                // activate control
-                if (!control.activeFocus) {
-                    internal.activateEditor();
-                    // set cursor position if no selection was previously set
-                    internal.positionCursor(mouse.x)
-                } else if (!internal.selectionMode){
-                    // reset selection and move cursor unde mouse click
-                    internal.resetEditorSelection(mouse.x);
-                } else if (internal.selectionMode) {
-                    // reset selection mode (onReleased is triggered prior to onClicked
-                    // and resetting selection mode there would cause to enter in the\
-                    // previous if-clause
-                    internal.selectionMode = false;
-                }
-            }
-
-            onPressAndHold: {
-                internal.activateEditor();
-                internal.positionCursor(mouse.x);
-                internal.popupTriggered();
-            }
-
-            onDoubleClicked: {
-                // select word under doubletap
-                if (!control.activeFocus)
-                    return;
-                editor.selectWord();
-                internal.selectionMode = false;
-            }
-            onPressed: {
-                // don't do anything while the control is inactive
-                if (!control.activeFocus || (pressedButtons != Qt.LeftButton))
-                    return;
-                internal.activateEditor();
-                if (control.selectedText === "") {
-                    internal.resetEditorSelection(mouse.x);
-                    internal.selectionMode = true;
-                }
-            }
-            onReleased: {
-                if (!containsMouse)
-                    internal.selectionMode = false;
+        contentWidth: editor.contentWidth
+        contentHeight: editor.contentHeight
+
+        TextInput {
+            id: editor
+            // FocusScope will forward focus to this component
+            focus: true
+            anchors.verticalCenter: parent.verticalCenter
+            // get the control's style
+            clip: true
+            cursorDelegate: cursor
+            color: control.__styleInstance.color
+            selectedTextColor: Theme.palette.selected.foregroundText
+            selectionColor: Theme.palette.selected.foreground
+            font.pixelSize: FontUtils.sizeToPixels("medium")
+            passwordCharacter: "\u2022"
+            // forward keys to the root element so it can be captured outside of it
+            Keys.forwardTo: [control]
+
+            // overrides
+            selectByMouse: false
+            activeFocusOnPress: false
+
+            // input selection and navigation handling
+            Ubuntu.Mouse.forwardTo: [inputHandler]
+            InputHandler {
+                id: inputHandler
+                anchors.fill: parent
+                main: control
+                input: editor
+                flickable: flicker
+                selectionModeTimeout: control.__styleInstance.selectionModeTimeout
             }
         }
     }

=== 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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +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 10:12:48 +0000
@@ -15,7 +15,7 @@
  */