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

[Zsombor Egri]

ComboButton component.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1885/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3912/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/833/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/833/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3499/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1886/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3914/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3499/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/834/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/834/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3947/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3501/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Is there a design document describing the combo button behaviour and appearance?

review: Needs Information

[Zsombor Egri (zsombi)]

> Is there a design document describing the combo button behaviour and
> appearance?

The design is here http://design.ubuntu.com/apps/building-blocks/buttons, but the combo button design had been updated, and the site does not have the updated layouts yet.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:958
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1948/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3803/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3805/console

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

I think the blue contents for the combobutton in the gallery is quite ugly:
http://ubuntuone.com/4jy8WPRYPLbLTez89wzqRh
also it does not really show how it should be used, with listitems that have alternative options to click on. Please change the example in the gallery.

I also don't really like the colors used in the button itself, but I guess we need design input for that.

Finally, the ^/V just "flips" when you click it, a rotation animation such as the ValueSelector has looks more sleek.

[Tim Peeters (tpeeters)]

I added an icon to the combobutton example:

            ComboButton {
                text: "Press me"
                objectName: "combobutton_collapsed"
                comboList: Rectangle {
                    height: units.gu(20)
                    width: parent.width
                    color: "blue"
                }
                iconSource: "call.png"

the icon gets aligned wrong, see http://ubuntuone.com/3LHlrfUwFssHkbx00v33Br

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:959
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1981/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4455/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4055/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/929/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/929/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4561/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4088/console

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

> I think the blue contents for the combobutton in the gallery is quite ugly:
> http://ubuntuone.com/4jy8WPRYPLbLTez89wzqRh
> also it does not really show how it should be used, with listitems that have
> alternative options to click on. Please change the example in the gallery.

Agreed. I'll add a Column with items into it.
>
>
> I also don't really like the colors used in the button itself, but I guess we
> need design input for that.

The colors I got from design. We were supposed to get UI facelift again for all the components. If they don't like the design, they can change it. Actually I was thinking to expose these colors/font properties so user can customize them freely.

>
> Finally, the ^/V just "flips" when you click it, a rotation animation such as
> the ValueSelector has looks more sleek.

That's the point. The chevron should not be animated while the dropdown toggles. The maximum we could do is to fade the image transition, however atm we don't have separate up/down chevrons. But we can make one, so I'll update the UI.

[Zsombor Egri (zsombi)]

> I added an icon to the combobutton example:
>
> ComboButton {
> text: "Press me"
> objectName: "combobutton_collapsed"
> comboList: Rectangle {
> height: units.gu(20)
> width: parent.width
> color: "blue"
> }
> iconSource: "call.png"
>
> the icon gets aligned wrong, see http://ubuntuone.com/3LHlrfUwFssHkbx00v33Br

Fixed in revno 960

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:961
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2015/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4662/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/963/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/963/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4789/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:962
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2017/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/965
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/965
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4268
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4812/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4315
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4861
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4861/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/7/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:966
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5007
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5007/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/34/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

>> Finally, the ^/V just "flips" when you click it, a rotation animation such as
>> the ValueSelector has looks more sleek.
>
>That's the point. The chevron should not be animated while the dropdown toggles. The maximum we could do is to fade >the image transition, however atm we don't have separate up/down chevrons. But we can make one, so I'll update the UI.

The point is not to make it look pretty?
Why no animation? You don't need to have separate up/down chevrons, you can rotate the chevron while opening the options

[Tim Peeters (tpeeters)]

When I launch the gallery (using the gallery.sh script in uitk root), I get a few errors like this:
file:///home/tim/dev/ubuntu-ui-toolkit/r/combobutton/modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml:201:20: Unable to assign [undefined] to QColor

Also when I open the popover for a combobutton, the items are not clickable to select them.

review: Needs Fixing

[Zsombor Egri (zsombi)]

> When I launch the gallery (using the gallery.sh script in uitk root), I get a
> few errors like this:
> file:///home/tim/dev/ubuntu-ui-toolkit/r/combobutton/modules/Ubuntu/Components
> /Themes/Ambiance/ComboButtonStyle.qml:201:20: Unable to assign [undefined] to
> QColor

Fixed.

>
>
> Also when I open the popover for a combobutton, the items are not clickable to
> select them.

Clicking on any item in the ComboButton's combo list does not automatically collapse the combo. I can add that, but that is not the default behavior of the component.

[Tim Peeters (tpeeters)]

108 /*!
109 + The font used for the button's text.
110 + */
111 + property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
112 +

should this be readonly?

if you overwrite the font, will the style pick it up?

[Tim Peeters (tpeeters)]

155 + The \a {dropdown} is a button located on the top-right side of the expanded
156 + component. Its functionality is to drive the component's expanded state.

It is also there on the right when the component is not expanded.

[Tim Peeters (tpeeters)]

316 + The default value is \l collapsedHeight + 19.5 GU.
317 + \sa collapsedHeight
318 + */
319 + property real expandedHeight: collapsedHeight + units.gu(19.5)

why 19.5?

[Tim Peeters (tpeeters)]

362 + default property alias comboList: comboListHolder.data

Is it needed to make this the default property? Does it make the code more clear to have the elements in the comboList as children of the ComboButton instead of giving this property?

If we keep the 'default' here, add a remark in the documentation that the children of the ComboButton are what will appear in the "panel" when expanded.

[Tim Peeters (tpeeters)]

348 + readonly property real comboListHeight: (expandedHeight < 0) ?
349 + comboListHolder.height :
350 + (expandedHeight - collapsedHeight -
351 + (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
352 +

Just to be safe with custom styles, check for combo.__styleInstance.hasOwnProperty(comboListMargin)

[Tim Peeters (tpeeters)]

I'd like to see a code example where a very simple Column with (Abstract)Buttons is used instead of a ListView for the comboList.

[Tim Peeters (tpeeters)]

364 + /* ----------------- Color and font configurations ----------------- */
365 + /*!
366 + The property specifies the color of the dropdown button when expanded.
367 + */
368 + property color dropdownColorPressed: __styleInstance ? __styleInstance.defaultDropdownColorPressed : color
369 +
370 + /*!
371 + The property specifies the color of the dropdown button when collapsed.
372 + */
373 + property color dropdownColorReleased: __styleInstance ? __styleInstance.defaultDropdownColorReleased : color

1 - check for hasOwnProperty(defaultDropdownColorPressed / defaultDropdownColorReleased).
2 - In this case expanded and collapsed is better than pressed/released, since you don't have to keep pressing to keep the item expanded.
3 - in the documentation, say the BACKGROUND color of the dropdown button AND THE COMBO LIST.

[Tim Peeters (tpeeters)]

Do we need the autoCollapse property? It is easy enough to implement if the app developer wants it.
What are use cases for having it/not having it?

I like to keep the API as minimal as possible (while still being practical). It is always easier to add stuff later than to remove it, and by not making things configurable we can more easily keep it consistent among apps and change defaults when design requests that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4896
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5039
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5039/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/39/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

251 + As combo list content is unknown for the component, eventual collapsing when
252 + an action selected from the combo list holder must be driven manually. Also,
253 + the default action of the main button can be changed in this way.

Can you rewrite these two sentences? I don't understand what you mean

[Tim Peeters (tpeeters)]

385 + Component.onCompleted: {
386 + // update mouse area to report clicks only on the main button area
387 + // area excluding dropDown button and combo list
388 + // we must do separate bindings as __mouseArea is a read-only property

__mouseArea was not defined as a readonly property. But maybe it being an alias has the same effect?

[Tim Peeters (tpeeters)]

in onCompleted:

398 + // bind a height calculation to avoid unwanted change
399 + combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});

hmm.. so if the developers set combo.height, it will be overridden in onCompleted? That will cause confusion. At least mention it in the docs, or preferably find another way to do this.

[Nekhelesh Ramananthan (nik90)]

The positioning of the button label seems a bit inconsistent. When there is only a label or an icon present, it is centered. However if both the label and icon is present, then they are aligned to the left. Why? The Button component does not follow this format either.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

How does the coloring of the comboList work? Is it possible for the app dev to modify it? The Expansion ListItem by Mzanetti just uses the app background which makes it integrate well with an app. Does comboList follow the same behaviour? Same question regarding the dropdown button.

review: Needs Information

[Tim Peeters (tpeeters)]

402 + // dropdown button
403 + MouseArea {
404 + id: dropDown

Why not an abstractButton? That gives you a HapticsEffect and onClicked when enter is pressed.

[Tim Peeters (tpeeters)]

419 + // expansion list
420 + Flickable {
421 + id: comboHolder

Some times you don't need to have a Flickable. Is it too complicated (reparenting) to put the Flickable in a Loader?

[Tim Peeters (tpeeters)]

473 + // drive the expansion height of the combo list holder
474 + Binding {
475 + target: combo.__styleInstance.comboListPanel
476 + property: "height"
477 + value: {
478 + if (!expanded) {
479 + return 0;
480 + }
481 + if (comboListHolder.anchorFill) {
482 + return combo.comboListHeight + combo.__styleInstance.comboListMargin;
483 + }
484 +
485 + var h = comboListHolder.height;
486 + var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
487 + if (combo.expandedHeight < 0) {
488 + return max;
489 + }
490 +
491 + return MathUtils.clamp(h, 0, max);
492 + }
493 + }

This belongs in the style.

review: Needs Fixing

[Tim Peeters (tpeeters)]

494 + // for testing purposes only
495 + Binding {
496 + target: combo.__styleInstance.comboListPanel
497 + property: "objectName"
498 + value: "combobutton_combopanel"
499 + }

if it is for testing only, remove it before releasing.

Why don't you just set the objectName in the style?

[Tim Peeters (tpeeters)]

501 + /*! \internal */
502 + // on style change, update the visual's names so we can access it when testing
503 + onStyleChanged: if (__styleInstance) __styleInstance.dropdownButtonVisuals.objectName = "combobutton_dropdow_visuals"
504 +}

what if you set a style that doens't have dropdownButtonVisuals?

Again, why not set it in the style?

[Tim Peeters (tpeeters)]

528 + property Item backgroundSource: null

from reading only ButtonStyle it is not clear to me what this property does. Can you add a comment there that explains it?

[Tim Peeters (tpeeters)]

629 + /*!
630 + The item which will hold the combo list data.
631 + */
632 + property Item comboList: comboListContent

why do you need to expose this in the style?

[Tim Peeters (tpeeters)]

652 + /*!
653 + Default color for the dropdown button when released.
654 + */
655 + property color defaultDropdownColorReleased: defaultColor
656 + /*!
657 + Default color for dropdown button when pressed.
658 + */
659 + property color defaultDropdownColorPressed: Qt.rgba(0, 0, 0, 0.05)

I would name these Expanded and Collapsed instead of Pressed and Released.

[Tim Peeters (tpeeters)]

673 + /*! \internal */
674 + property ComboButton combo: styledItem

you could make it really internal

[Tim Peeters (tpeeters)]

    /*! \internal */
    function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }

also this could be really internal

[Tim Peeters (tpeeters)]

It is not clear to me why we need this. Can you add a comment to explain?

[Tim Peeters (tpeeters)]

^a comment in the code I mean :)

[Zsombor Egri (zsombi)]

> 108 /*!
> 109 + The font used for the button's text.
> 110 + */
> 111 + property font font: __styleInstance ? __styleInstance.defaultFont :
> Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
> 112 +
>
>
> should this be readonly?

No. As with the colors, we need to be able to configure the fonts without the need to redo the style.

>
> if you overwrite the font, will the style pick it up?

Yes. This binding is just to take the style default, whatever the user will set will be reflected in the style.

[Zsombor Egri (zsombi)]

> 316 + The default value is \l collapsedHeight + 19.5 GU.
> 317 + \sa collapsedHeight
> 318 + */
> 319 + property real expandedHeight: collapsedHeight + units.gu(19.5)
>
>
> why 19.5?

Because that's the value that can keep 3 ListItems without clipping.

[Zsombor Egri (zsombi)]

> 362 + default property alias comboList: comboListHolder.data
>
> Is it needed to make this the default property? Does it make the code more
> clear to have the elements in the comboList as children of the ComboButton
> instead of giving this property?

And what would you do with the children components added to it eventually? Where would you put those? At least in this way you are sure that it lands in the combo list...

>
> If we keep the 'default' here, add a remark in the documentation that the
> children of the ComboButton are what will appear in the "panel" when expanded.

It's there :)

[Zsombor Egri (zsombi)]

> 348 + readonly property real comboListHeight: (expandedHeight < 0) ?
> 349 + comboListHolder.height :
> 350 + (expandedHeight - collapsedHeight -
> 351 + (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
> 352 +
>
> Just to be safe with custom styles, check for
> combo.__styleInstance.hasOwnProperty(comboListMargin)

Actually we should not do that anymore. This is the first component that has the style API fixed, so we should no longer check for the existence of the properties.

[Zsombor Egri (zsombi)]

> I'd like to see a code example where a very simple Column with
> (Abstract)Buttons is used instead of a ListView for the comboList.

If you mean you'd like to see an example in gallery/documentation, it's ok, I'll add one. However there's one not with Buttons but with other elements in the tests/resources/buttons

[Zsombor Egri (zsombi)]

> 364 + /* ----------------- Color and font configurations -----------------
> */
> 365 + /*!
> 366 + The property specifies the color of the dropdown button when
> expanded.
> 367 + */
> 368 + property color dropdownColorPressed: __styleInstance ?
> __styleInstance.defaultDropdownColorPressed : color
> 369 +
> 370 + /*!
> 371 + The property specifies the color of the dropdown button when
> collapsed.
> 372 + */
> 373 + property color dropdownColorReleased: __styleInstance ?
> __styleInstance.defaultDropdownColorReleased : color
>
>
> 1 - check for hasOwnProperty(defaultDropdownColorPressed /
> defaultDropdownColorReleased).

Nope. As said, style API will need to match in order to have the component working properly.

> 2 - In this case expanded and collapsed is better than pressed/released, since
> you don't have to keep pressing to keep the item expanded.
> 3 - in the documentation, say the BACKGROUND color of the dropdown button AND
> THE COMBO LIST.

Agree. Will fix that.

[Zsombor Egri (zsombi)]

> Do we need the autoCollapse property? It is easy enough to implement if the
> app developer wants it.
> What are use cases for having it/not having it?
>
> I like to keep the API as minimal as possible (while still being practical).
> It is always easier to add stuff later than to remove it, and by not making
> things configurable we can more easily keep it consistent among apps and
> change defaults when design requests that.

Removed.

[Zsombor Egri (zsombi)]

> The positioning of the button label seems a bit inconsistent. When there is
> only a label or an icon present, it is centered. However if both the label and
> icon is present, then they are aligned to the left. Why? The Button component
> does not follow this format either.

Actually it is consistent with Button, especially that both the component and the style derives/uses the Button style. Check the Ubuntu UI Toolkit gallery's Buttons page, where all the buttons are presented.

[Zsombor Egri (zsombi)]

> How does the coloring of the comboList work? Is it possible for the app dev to
> modify it? The Expansion ListItem by Mzanetti just uses the app background
> which makes it integrate well with an app. Does comboList follow the same
> behaviour? Same question regarding the dropdown button.

We've changed the API a bit and have dropdownColor which colors both the dropdown and the combo list background. The color codes we got are not yet in par with the app background, however those may change.

Expandable does not use any color, neither the text color is changeable. Which introduces problems like text not being readable when has the same tone as the background. We still don't have a proper fox for those cases.

[Zsombor Egri (zsombi)]

> 402 + // dropdown button
> 403 + MouseArea {
> 404 + id: dropDown
>
>
> Why not an abstractButton? That gives you a HapticsEffect and onClicked when
> enter is pressed.

Fixed.

[Zsombor Egri (zsombi)]

> 419 + // expansion list
> 420 + Flickable {
> 421 + id: comboHolder
>
>
> Some times you don't need to have a Flickable. Is it too complicated
> (reparenting) to put the Flickable in a Loader?

As we discussed, it is more bug-prone, beside it introduces an extra object for the cases we need a Flickable...

[Zsombor Egri (zsombi)]

> 528 + property Item backgroundSource: null
>
> from reading only ButtonStyle it is not clear to me what this property does.
> Can you add a comment there that explains it?

Done.

[Zsombor Egri (zsombi)]

> 629 + /*!
> 630 + The item which will hold the combo list data.
> 631 + */
> 632 + property Item comboList: comboListContent
>
> why do you need to expose this in the style?

The style exposes two properties for the combo list:
1) comboListPanel, which holds the entire combo list - this is exposed to the component so it can control its size
2) comboListHolder (former comboList) which is the actual item onto which the combo list will be placed.

Now, implementations can have both of them pointing to the same component, however we need now this to be separated as the first one is the UbuntuShape and the second one is the item that goes into the shape and clipped.

I've added additional explanation to the properties.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:969
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4930/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4514/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5083/console

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Prerequisite added, component to land in version 1.1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:971
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/combobutton/+merge/216819/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4990/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5169/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:976
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/combobutton/+merge/216819/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4997/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4606/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5177/console

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

good stuff :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/89/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/415/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5039/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4661/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5228/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/89/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/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5043/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-autolanding/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-autolanding/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-autolanding/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4665/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5232/console

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Jenkins got confused, let's try again.

[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/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5049/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-autolanding/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-autolanding/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-autolanding/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4671/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5238/console

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

3490 + def test_main_pressed():

It wasn't Jenkins, it was me. In one of the latest revisions the self param got removed from the method...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/98/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/431
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/98
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6400
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5244/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/98/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

thanks

review: Approve

[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/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5064/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-autolanding/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-autolanding/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-autolanding/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4689/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5253/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5065/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4690/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5254/console

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

review: Needs Fixing (continuous-integration)

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

983. By Zsombor Egri on 2014-04-25

rogue file removed

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2014-04-25 12:06:54 +0000
+++ components.api	2014-04-25 13:00:38 +0000
@@ -45,6 +45,14 @@
     readonly property color coolGrey
     property Gradient orangeGradient
     property Gradient greyGradient
+ComboButton 1.1
+Button
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    readonly property real comboListHeight
+    default property list<Item> comboList
+    property color dropdownColor
 CrossFadeImage 0.1 1.0
 Item
     property url source

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/overview.qdoc	2014-04-25 13:00:38 +0000
@@ -31,7 +31,7 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 1.0
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu
 
@@ -66,28 +66,33 @@
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 1.0
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist theming
 
+     \part Style API
+     The Style API defines the interface components use to style the visuals.
+     Themes must make sure that these interfaces are all implemented.
+     \annotatedlist style-api
+
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 1.0
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 1.0
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 1.0
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu-services
 

=== modified file 'documentation/resolution-independence.qdoc'
--- documentation/resolution-independence.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/resolution-independence.qdoc	2014-04-25 13:00:38 +0000
@@ -64,7 +64,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Item {
         width: units.gu(2)
@@ -79,7 +79,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Rectangle {
         height: units.dp(1)
@@ -143,7 +143,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Label {
         fontSize: "small"

=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
--- documentation/snippets/layouts/SimpleLayout.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/SimpleLayout.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout1.qml'
--- documentation/snippets/layouts/layout1.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/layout1.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout2.qml'
--- documentation/snippets/layouts/layout2.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/layout2.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout3.qml'
--- documentation/snippets/layouts/layout3.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/layout3.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout6.qml'
--- documentation/snippets/layouts/layout6.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/layout6.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/layouts/layout7.qml'
--- documentation/snippets/layouts/layout7.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/layouts/layout7.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
--- documentation/snippets/statesaver/ColorChanger.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/statesaver/ColorChanger.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![color-saver]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root

=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-20 19:25:12 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root

=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2014-04-20 19:25:12 +0000
+++ documentation/ubuntu-components.qdoc	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 1.0
+    \qmlmodule Ubuntu.Components 1.1
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */

=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2014-04-20 19:25:12 +0000
+++ examples/calculator/calculator.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator

=== modified file 'examples/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2014-04-20 19:25:12 +0000
+++ examples/calculator/components/DefaultLayout.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'examples/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2014-04-20 19:25:12 +0000
+++ examples/calculator/components/Functions.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Layouts 1.0
 
 Grid {

=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2014-04-20 19:25:12 +0000
+++ examples/jokes/jokes.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import QtMultimedia 5.0
 
 /*!

=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2014-04-20 19:25:12 +0000
+++ examples/locale/locale.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-23 09:21:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
 
 Template {
     objectName: "buttonsTemplate"
@@ -80,4 +81,67 @@
             }
         }
     }
+
+    TemplateSection {
+        className: "ComboButton"
+
+        TemplateRow {
+            title: i18n.tr("Collapsed")
+
+            ComboButton {
+                text: "Press me"
+                objectName: "combobutton_collapsed"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Icon")
+
+            ComboButton {
+                iconSource: "call.png"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Icon+Text")
+
+            ComboButton {
+                text: "Answer"
+                iconSource: "call.png"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Expanded")
+
+            ComboButton {
+                text: "Press me"
+                objectName: "combobutton_expanded"
+                expanded: true
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2014-04-20 19:25:12 +0000
+++ examples/unit-converter/unit-converter.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import "conversion.js" as Converter
 
 /*!

=== modified file 'manual-tests/button.qml'
--- manual-tests/button.qml	2014-04-20 19:25:12 +0000
+++ manual-tests/button.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Button {
    id: button

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Action.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Action
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A visual representation of an Action. The API of ActionItem is a
         copy of the API of \l Action, with additional properties to define

=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActionList
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief List of \l Action items
 */

=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActivityIndicator
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The ActivityIndicator component visually indicates that a task of
     unknown duration is in progress, e.g. busy indication, connection in progress

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype AnimatedItem
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The AnimatedItem drives the animated components behavior inside a Flickable.
     Reports whether the component whos parent is a Flickable is in the visible area or not,

=== modified file 'modules/Ubuntu/Components/Button.qml'
--- modules/Ubuntu/Components/Button.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Button.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Button
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Standard Ubuntu button.
 
@@ -83,6 +83,11 @@
     property Gradient gradient: __styleInstance.defaultGradient
 
     /*!
+      The font used for the button's text.
+    */
+    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
+
+    /*!
        The source URL of the icon to display inside the button.
        Leave this value blank for a text-only button.
        If \l action is set, the default iconSource is that of the action.

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype CheckBox
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief CheckBox is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l Switch, the

=== added file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2014-04-25 13:00:38 +0000
@@ -0,0 +1,366 @@
+/*
+ * 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.Popups 1.0
+import "mathUtils.js" as MathUtils
+
+/*!
+    \qmltype ComboButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Ubuntu button providing a drop-down panel visualizing custom options.
+
+    The component is composed of three main blocks: \b {main button}, \b {dropdown}
+    and \b {combo list}.
+
+    The \a {main button} holds the main functionailty of the component, and it is
+    located at the left-top side of the expanded button. The \a clicked() signal
+    is triggered only when this button is pressed.
+
+    The \a {dropdown} is a button located on the right of the main button. Its
+    functionality is to drive the component's expanded state.
+
+    The \a {combo list} is a panel showing the content specified in \l comboList
+    property when expanded. The content is stretched horizontally to the component's
+    width, and its height is controlled by the \l expandedHeight property as follows:
+    \list
+    \li If the content height is smaller than the value of \l expandedHeight, the combo
+        list will be expanded only to the height of the content.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "smaller content"
+            Rectangle {
+                height: units.gu(5) // smaller than the default expandedHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \li If the content height is greater than \l expandedHeight, the combo list will
+        expand till the height specified by the property and the content will be
+        scrolled; in case the combo list content is one single Flickable, ListView,
+        GridView or PathView, the content scrolling will be provided by the content
+        itself.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "long scrolled content"
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Rectangle {
+                        height: units.gu(5)
+                        color: "blue"
+                    }
+                }
+            }
+        }
+        \endqml
+    \li In case the content is a single Flickable, ListView, GridView or PathView,
+        the content will be filling the entire combo list area defined.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0
+        ComboButton {
+            text: "listview"
+            ListView {
+                model: 10
+                delegate: Standard {
+                    text: "Item #" + modelData
+                }
+            }
+        }
+        \endqml
+    \li Vertical anchoring of combo list content to its parent is not possible
+        as the expansion calculation is done based on the combo list content height.
+        If the content wants to take the size of the entire combo list, it should
+        bind its height to the \l comboListHeight property.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            id: combo
+            text: "smaller content"
+            Rectangle {
+                height: combo.comboListHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \li In case the expansion needs to be the size of the combo list content, the \l
+        expandedHeight should be set to -1.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "auto-sized content"
+            expandedHeight: -1
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Button {
+                        text: "Button #" + modelData
+                    }
+                }
+            }
+        }
+        \endqml
+    \endlist
+
+    The combo list can be expanded/collapsed either through the \l expanded property
+    or by clicking on the dropdown button. It is not collapsed when pressing the main
+    button or clicking on the combo list. In order to do an auto-collapsing button
+    you must reset the expanded property (set it to false) when the main button is
+    clicked or when a selection is taken from the combo list content. The following
+    example illustrates a possible implementation.
+
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 1.1
+
+    ComboButton {
+        id: combo
+        text: "Auto closing"
+        expanded: true
+        expandedHeight: units.gu(30)
+        onClicked: expanded = false
+        UbuntuListView {
+            width: parent.width
+            height: combo.comboListHeight
+            model: 20
+            delegate: Standard {
+                text: "Action #" + modelData
+                onClicked: {
+                    combo.text = text;
+                    combo.expanded = false;
+                }
+            }
+        }
+    }
+    \endqml
+
+    \section2 Styling
+    The style of the component is defined in \l ComboButtonStyle.
+  */
+Button {
+    id: combo
+
+    /*!
+      Specifies whether the combo list is expanded or not. The default falue is
+      false.
+      */
+    property bool expanded: false
+
+    /*!
+      The property holds the height of the component when collapsed. By default
+      the value is the implicit height of the component.
+      */
+    property real collapsedHeight: implicitHeight
+
+    /*!
+        The property holds the maximum height value the component should expand.
+        When setting the property, remember to take into account the \l collapsedHeight
+        value. The best practice is to use bind it with collapsedHeight.
+        \qml
+        ComboButton {
+            text: "altered expandedHeight"
+            expandedHeight: collapsedHeight + units.gu(25)
+        }
+        \endqml
+
+        A value of -1 will instruct the component to expand the combo list as
+        much as its content height is.
+
+        The default value is \l collapsedHeight + 19.5 GU, so at least 3 ListItems
+        can fit in the combo list.
+        \sa collapsedHeight
+      */
+    property real expandedHeight: collapsedHeight + units.gu(19.5)
+
+    /*!
+      The property holds the maximum combo list height allowed based on the
+      \l expandedHeight and \l collapsedHeight values. It is a convenience property
+      that can be used to size the combo list content.
+      \qml
+      import QtQuick 2.0
+      import Ubuntu.Components 1.1
+      import Ubuntu.Components.ListItems 0.1
+      ComboButton {
+          id: combo
+          text: "Full comboList size"
+          ListView {
+              anchors {
+                  left: parent.left
+                  right: parent.right
+              }
+              height: combo.comboListHeight
+              model: 20
+              delegate: Standard {
+                  text: "Action #" + modelData
+              }
+          }
+      }
+      \endqml
+
+      \sa collapsedHeight, expandedHeight
+      */
+    readonly property real comboListHeight: (expandedHeight < 0) ?
+                            comboListHolder.height :
+                            (expandedHeight - collapsedHeight -
+                            (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
+
+    /*!
+        \qmlproperty list<Item> comboList
+        \default
+        Property holding the list of items to be shown in the combo list. Being
+        a default property children items declared will land in the combo list.
+        \note The component is not responsible for layouting the content. It only
+        provides scrolling abilities for the case the content exceeds the defined
+        expanded height.
+      */
+    default property alias comboList: comboListHolder.data
+
+    /* ----------------- Color and font configurations ----------------- */
+    /*!
+      The property specifies the color of the dropdown button and the combo list
+      for both collapsed and expanded states. You can use \l expanded to define
+      different colors for expanded or collapsed states.
+      */
+    property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
+
+
+    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
+
+    Component.onCompleted: {
+        // update mouse area to report clicks only on the main button area
+        // area excluding dropDown button and combo list
+        // we must do separate bindings as __mouseArea is a read-only property
+        __mouseArea.anchors.fill = undefined;
+        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
+        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
+        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
+        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
+        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
+        // for autopilot, set the main button name
+        __mouseArea.objectName = "combobutton_mainbutton";
+
+        // bind a height calculation to avoid unwanted change
+        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
+    }
+
+    // dropdown button
+    AbstractButton {
+        id: dropDown
+        objectName: "combobutton_dropdown"
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+        width: combo.__styleInstance ? combo.__styleInstance.dropDownWidth : 0
+        height: combo.collapsedHeight
+        // open dropdown when pressed, not when clicked
+        onClicked: {
+            // toggle expanded
+            combo.expanded = !combo.expanded;
+        }
+    }
+
+    // expansion list
+    Flickable {
+        id: comboHolder
+        parent: combo.__styleInstance ? combo.__styleInstance.comboListHolder : combo
+        anchors.fill: parent
+        interactive: combo.expanded && !contentIsFlickable() && (combo.expandedHeight > 0)
+        flickableDirection: Flickable.VerticalFlick
+        contentHeight: comboListHolder.height
+
+        // consider PathView as Flickable in this case as well!
+        function contentIsFlickable() {
+            return (comboListHolder.children.length === 1) &&
+                    comboListHolder.children[0].hasOwnProperty("flicking");
+        }
+
+        Item {
+            id: comboListHolder
+            objectName: "combobutton_combolist"
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            // stretch children width to holder's width
+            // must do binding to height manually to avoid binding loops caused
+            // by the vertical stretching when the component is a single flickable
+            property bool stretch: (combo.expandedHeight > 0 && comboHolder.contentIsFlickable())
+            onStretchChanged: stretchChildren()
+            onChildrenChanged: stretchChildren()
+            function stretchChildren() {
+                for (var i in comboListHolder.children) {
+                    var child = comboListHolder.children[i];
+                    if (comboListHolder.stretch) {
+                        child.anchors.left = undefined;
+                        child.anchors.right = undefined;
+                        child.anchors.fill = comboListHolder;
+                        comboListHolder.height = Qt.binding(function() {
+                            return combo.comboListHeight;
+                        });
+                    } else {
+                        child.anchors.left = comboListHolder.left;
+                        child.anchors.right = comboListHolder.right;
+                        comboListHolder.height = Qt.binding(function() {
+                            return comboListHolder.childrenRect.height;
+                        });
+                    }
+                }
+            }
+        }
+    }
+    Scrollbar {
+        flickableItem: comboHolder
+    }
+
+    /*
+      Drive the expansion height of the combo list holder
+      This is a common functionaity in all combo buttons, therefore we can have it
+      in the main component.
+      */
+    Binding {
+        target: combo.__styleInstance.comboListPanel
+        property: "height"
+        value: {
+            if (!expanded) {
+                return 0;
+            }
+            if (comboListHolder.stretch) {
+                return combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            }
+
+            var h = comboListHolder.height;
+            var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            if (combo.expandedHeight < 0) {
+                return max;
+            }
+
+            return MathUtils.clamp(h, 0, max);
+        }
+    }
+}

=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qml'
--- modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-25 13:00:38 +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 1.0 as Ubuntu
+import Ubuntu.Components 1.1 as Ubuntu
 
 /*!
    \qmltype CrossFadeImage
@@ -28,7 +28,7 @@
 
    \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         CrossFadeImage {
             width: units.gu(100)

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-04-24 18:21:34 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype Header
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
 */
 StyledItem {

=== modified file 'modules/Ubuntu/Components/Icon.qml'
--- modules/Ubuntu/Components/Icon.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Icon.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Icon
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The Icon component displays an icon from the icon theme.
 

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Label.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Label
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Text with Ubuntu styling.
 

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Base

=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Caption

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Empty
@@ -34,7 +34,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-25 13:00:38 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Expandable
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype ExpandablesColumn
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {

=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 // 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-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "." as ListItem
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype ItemSelector

=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 // internal helper class for text inside the list items.
 Label {

=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 // Internal helper class for the visuals of
 // the progression symbol.

=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -26,7 +26,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleControl {

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Standard
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {

=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype MultiValue

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-04-24 18:21:34 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype MainView
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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 1.0
+        import Ubuntu.Components 1.1
 
         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 1.0
+        import Ubuntu.Components 1.1
 
         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 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(48)
@@ -169,7 +169,7 @@
       the content:
       \qml
           import QtQuick 2.0
-          import Ubuntu.Components 1.0
+          import Ubuntu.Components 1.1
 
           MainView {
               width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/Object.qml'
--- modules/Ubuntu/Components/Object.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Object.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 /*!
     \qmltype Object
     \internal
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-04-25 13:00:38 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 1.0 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 /*!
     \qmltype OptionSelector
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu-components
     \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
     listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         Column {
             spacing: units.gu(3)
 

=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype OptionSelectorDelegate
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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 1.0
+        import Ubuntu.Components 1.1
         Column {
             width: 250
             OptionSelector {
@@ -45,7 +45,7 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 1.0 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 ListItem.Standard {
     id: option

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-04-23 09:10:47 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype OrientationHelper
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The OrientationHelper automatically rotates its children following the
            orientation of the device.

=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2014-04-24 18:21:34 +0000
+++ modules/Ubuntu/Components/Page.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Page
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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 1.0
+        import Ubuntu.Components 1.1
 
         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 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(30)

=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageStack
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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,7 +39,7 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {

=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 /*!
     \internal
     \qmltype PageTreeNode
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/PageWrapper.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Internal class used by \l PageStack
 

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-24 18:28:43 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-04-25 13:00:38 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 /*!
     \qmltype Panel
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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 1.0
+        import Ubuntu.Components 1.1
 
         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 1.0
+        import Ubuntu.Components 1.1
 
         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 1.0
+        import Ubuntu.Components 1.1
 
         Rectangle {
             color: Theme.palette.normal.background

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DatePicker
@@ -36,7 +36,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -56,7 +56,7 @@
     which shows only year and month date units would look as follows:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -75,7 +75,7 @@
     The following example demonstrates how to use DatePicker for time picking.
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -112,7 +112,7 @@
     \endlist
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
     import Ubuntu.Components.Pickers 1.0
 
     Column {

=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     circular: true

=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Dialer

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DialerHand

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-25 13:00:38 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     circular: (count >= 11)

=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Picker
@@ -35,7 +35,7 @@
     Example:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
     import Ubuntu.Components.Pickers 1.0
 
     Picker {

=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype PickerDelegate

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-25 13:00:38 +0000
@@ -16,13 +16,13 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 
 /*!
     \qmltype PickerPanel
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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 1.0
+    import Ubuntu.Components 1.1
 
     MainWindow {
         width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Row {
     id: row

=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     // local properties

=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 /*!

=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
@@ -31,7 +31,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DefaultSheet
@@ -32,7 +32,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -33,7 +33,7 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Popover
@@ -32,7 +32,7 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
         import Ubuntu.Components.Popups 1.0
 

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype PopupBase

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype SheetBase

=== modified file 'modules/Ubuntu/Components/ProgressBar.qml'
--- modules/Ubuntu/Components/ProgressBar.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ProgressBar.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ProgressBar
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ScrollBar
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Slider.qml	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Slider
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract StyledItem
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Switch.qml	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Switch
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Tab.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tab
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-23 15:20:44 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype TabBar
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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-23 22:36:54 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tabs
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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,7 +33,7 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
@@ -104,7 +104,7 @@
 
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             id: mainView

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextArea
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The TextArea item displays a block of editable, scrollable, formatted
     text.

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype TextField
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \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
@@ -529,7 +529,7 @@
 
       \qml
       import QtQuick 2.0
-      import Ubuntu.Components 1.0
+      import Ubuntu.Components 1.1
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 import "Popups" 0.1
 
 ActionSelectionPopover {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Image {
     id: container

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: bubbleShape

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: buttonForeground
@@ -30,6 +30,7 @@
     property real spacing
     property bool hasIcon: iconSource != ""
     property bool hasText: text != ""
+    property alias font: label.font
 
     opacity: enabled ? 1.0 : 0.5
     implicitHeight: Math.max(icon.height, label.height)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: buttonStyle
@@ -26,7 +26,16 @@
     property real minimumWidth: units.gu(10)
     property real horizontalPadding: units.gu(1)
     property color defaultColor: UbuntuColors.orange
+    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
     property Gradient defaultGradient
+    property real buttonFaceOffset: 0
+    /*!
+      The property overrides the button's default background with an item. This
+      item can be used by derived styles to reuse the ButtonStyle and override
+      the default coloured background with an image or any other drawing.
+      The default value is null.
+      */
+    property Item backgroundSource: null
 
     width: button.width
     height: button.height
@@ -36,12 +45,22 @@
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
+    /*! \internal */
+    // Color properties in a JS ternary operator don't work as expected in
+    // QML because it overwrites alpha values with 1. A workaround is to use
+    // Qt.rgba(). For more information, see
+    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
+    // https://bugreports.qt-project.org/browse/QTBUG-32238.
+    function __colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
+
+
     /* The proxy is necessary because Gradient.stops and GradientStop.color are
        non-NOTIFYable properties. They cannot be written to so it is fine but
        the proxy avoids the warnings.
     */
+    property QtObject gradientProxy: gradientProxyObject
     QtObject {
-        id: gradientProxy
+        id: gradientProxyObject
         property color topColor
         property color bottomColor
 
@@ -67,16 +86,11 @@
         id: background
         anchors.fill: parent
         borderSource: "radius_idle.sci"
-        visible: color.a != 0.0
+        visible: (color.a != 0.0) || backgroundSource
+        image: backgroundSource
 
-        // Color properties in a JS ternary operator don't work as expected in
-        // QML because it overwrites alpha values with 1. A workaround is to use
-        // Qt.rgba(). For more information, see
-        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
-        // https://bugreports.qt-project.org/browse/QTBUG-32238.
-        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
-        color: isGradient ? colorHack(gradientProxy.topColor) : colorHack(button.color)
-        gradientColor: isGradient ? colorHack(gradientProxy.bottomColor) : colorHack(button.color)
+        color: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
+        gradientColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
     }
 
     UbuntuShape {
@@ -98,7 +112,10 @@
     ButtonForeground {
         id: foreground
         width: parent.width - 2*horizontalPadding
-        anchors.centerIn: parent
+        anchors {
+            centerIn: parent
+            horizontalCenterOffset: buttonFaceOffset
+        }
         text: button.text
         /* Pick either a clear or dark text color depending on the luminance of the
            background color to maintain good contrast (works in most cases)
@@ -107,6 +124,7 @@
         iconSource: button.iconSource
         iconPosition: button.iconPosition
         iconSize: units.gu(3)
+        font: button.font
         spacing: horizontalPadding
         transformOrigin: Item.Top
         scale: button.pressed ? 0.98 : 1.0

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: checkBoxStyle

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-25 13:00:38 +0000
@@ -0,0 +1,243 @@
+/*
+ * 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 1.1
+
+/*!
+    \qmltype ComboButton
+    \ingroup style-api
+    \brief ComboButton style API.
+
+    The component defines the style of the ComboButton component.
+  */
+Item {
+    id: comboStyle
+
+    /*!
+      Width of the drop down button.
+      */
+    property real dropDownWidth: units.gu(5)
+
+    /*!
+      Width of the dropdown button separator.
+      */
+    property real dropDownSeparatorWidth: units.dp(2)
+
+    /*!
+      Distance between the combo list and the main button.
+      */
+    property real comboListMargin: units.gu(0.8)
+
+    /*!
+      The item which will holds the combo list data. Implementations can point both
+      this \l comboListPanel to the same component, however separate items should be
+      used if a gap between the panel and the content is required.
+      See Ambiance theme.
+      */
+    property Item comboListHolder: comboListContent
+
+    /*!
+      The item pointing to the panel holding the combo list and additional design
+      artifacts. It is used by the component to drive the expansion size.
+      */
+    property Item comboListPanel: panelItem
+
+    /*!
+      \qmlproperty color defaultColor
+      Default color for the main button.
+      */
+    property alias defaultColor: mainButton.defaultColor
+
+    /*!
+      \qmlproperty Gradient defaultGradient
+      Default gradient for the main button.
+      */
+    property alias defaultGradient: mainButton.defaultGradient
+
+    /*!
+      Default color for the dropdown button when released.
+      */
+    property color defaultDropdownColor: __combo.expanded ? Qt.rgba(0, 0, 0, 0.05) : defaultColor
+    /*!
+      Default button face font.
+      */
+    property alias defaultFont: mainButton.defaultFont
+
+
+    width: __combo.width
+    height: __combo.collapsedHeight
+
+    /*! \internal */
+    property ComboButton __combo: styledItem
+
+    implicitWidth: mainButton.implicitWidth
+    implicitHeight: mainButton.implicitHeight
+
+    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+    LayoutMirroring.childrenInherit: true
+
+    ButtonStyle {
+        id: mainButton
+        anchors {
+            left: parent.left
+            top: parent.top
+            right: parent.right
+        }
+        height: __combo.collapsedHeight
+        // overrides
+        backgroundSource: comboFace
+        buttonFaceOffset: -dropDownWidth/2 - dropDownSeparatorWidth
+        horizontalPadding: units.gu(4) - dropDownSeparatorWidth
+        minimumWidth: units.gu(36)
+
+        // FIXME: use hardcoded color while we get the theme palette updated
+        defaultColor: "#b2b2b2"
+        defaultGradient: null
+
+        // button face
+        ShaderEffectSource {
+            id: comboFace
+            sourceItem: content
+            hideSource: true
+            // FIXME: visible: false prevents rendering so make it a nearly
+            // transparent 1x1 pixel instead
+            opacity: 0.01
+            width: 1
+            height: 1
+        }
+
+        Item {
+            id: content
+            width: mainButton.width
+            height: mainButton.height
+
+            Rectangle {
+                anchors {
+                    fill: parent
+                    rightMargin: comboStyle.dropDownSeparatorWidth + comboStyle.dropDownWidth
+                }
+                color: __combo.color
+                gradient: mainButton.isGradient ? __combo.gradient : null
+            }
+
+            // distancer
+            Item {
+                anchors {
+                    right: dropDownButton.right
+                    top: parent.top
+                    bottom: parent.bottom
+                }
+                width: comboStyle.dropDownSeparatorWidth
+            }
+
+            Rectangle {
+                id: dropDownButton
+                objectName: "combobutton_dropdown_visuals"
+                anchors {
+                    right: parent.right
+                    top: parent.top
+                    bottom: parent.bottom
+                }
+                width: comboStyle.dropDownWidth
+                color: mainButton.__colorHack(__combo.dropdownColor)
+                Image {
+                    source: "artwork/chevron.png"
+                    anchors.centerIn: parent
+                    rotation: __combo.expanded ? -90 : 90
+                }
+            }
+        }
+    }
+
+    Item {
+        id: panelItem
+        objectName: "combobutton_combopanel"
+        anchors {
+            left: parent.left
+            top: mainButton.bottom
+            right: parent.right
+        }
+        opacity: __combo.expanded && (__combo.comboList.length > 0)? 1.0 : 0.0
+
+        ShaderEffectSource {
+            id: listContent
+            sourceItem: comboListContent
+            hideSource: true
+            // FIXME: visible: false prevents rendering so make it a nearly
+            // transparent 1x1 pixel instead
+            opacity: 0.01
+            width: 1
+            height: 1
+        }
+        Rectangle {
+            id: comboListContent
+            anchors {
+                fill: parent
+                topMargin: comboListMargin
+            }
+            clip: true
+            color: mainButton.__colorHack(__combo.dropdownColor)
+        }
+
+        BorderImage {
+            id: shadow
+            anchors {
+                fill: parent
+                leftMargin: -units.gu(0.5)
+                topMargin: comboListMargin - units.gu(0.5)
+                rightMargin: -units.gu(0.5)
+                bottomMargin: -units.gu(0.5)
+            }
+            source: "artwork/bubble_shadow.sci"
+        }
+        UbuntuShape {
+            id: shape
+            anchors {
+                fill: parent
+                topMargin: comboListMargin
+            }
+            visible: true
+            borderSource: "radius_idle.sci"
+            image: listContent
+        }
+
+        Image {
+            source: "artwork/bubble_arrow.png"
+            rotation: 180
+            anchors {
+                bottom: shape.top
+                bottomMargin: -1
+                right: parent.right
+                rightMargin: dropDownWidth / 2 - units.gu(0.5)
+            }
+
+        }
+
+        Behavior on height {
+            NumberAnimation {
+                duration: UbuntuAnimation.FastDuration
+                easing: UbuntuAnimation.StandardEasing
+            }
+        }
+        Behavior on opacity {
+            NumberAnimation {
+                duration: UbuntuAnimation.FastDuration
+                easing: UbuntuAnimation.StandardEasing
+            }
+        }
+    }
+}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     // style API

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import QtGraphicalEffects 1.0
 
 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: dialogForegroundStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-23 18:14:56 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-25 13:00:38 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: headerStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: ambianceStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-04-25 13:00:38 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     // styling properties

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: ambianceStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     property real minFade: 0.2

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: progressBarStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: progressionVisualStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*
   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	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 EditorCursorStyle {
     id: cursor

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: visuals

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*
   The default slider style consists of a bar and a thumb shape.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: switchStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-23 15:20:44 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: tabBarStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 // frame
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: visuals

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-25 13:00:38 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: visuals

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-03-07 21:09:54 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-04-25 13:00:38 +0000
@@ -27,3 +27,21 @@
 DialerStyle 0.1 DialerStyle.qml
 DialerHandStyle 0.1 DialerHandStyle.qml
 internal HighlightMagnifier HighlightMagnifier.qml
+
+#version 1.0
+
+MainViewStyle 1.0 MainViewStyle.qml
+ListItemOptionSelector 1.0 ListItemOptionSelector.qml
+OptionSelectorStyle 1.0 OptionSelectorStyle.qml
+PopoverForegroundStyle 1.0 PopoverForegroundStyle.qml
+TabBarStyle 1.0 TabBarStyle.qml
+TextAreaStyle 1.0 TextAreaStyle.qml
+TextFieldStyle 1.0 TextFieldStyle.qml
+PickerStyle 1.0 PickerStyle.qml
+DatePickerStyle 1.0 DatePickerStyle.qml
+PickerDelegateStyle 1.0 PickerDelegateStyle.qml
+DialerStyle 1.0 DialerStyle.qml
+DialerHandStyle 1.0 DialerHandStyle.qml
+
+#version 1.1
+ComboButtonStyle 1.1 ComboButtonStyle.qml

=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 /*!
     \internal
     \qmltype Toolbar
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Application toolbar. This class is not exposed because it will
             be automatically added when a Page defines tools.

=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarButton
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief An \l ActionItem that represents a button in the toolbar.
         ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.
@@ -28,7 +28,7 @@
         Example of different ways to define the toolbar button:
         \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(50)

=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-04-25 13:00:38 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ToolbarItems
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Row of Items to be placed in a toolbar.
 
@@ -38,7 +38,7 @@
     be visible to the user:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(50)
@@ -70,7 +70,7 @@
     the full height of the toolbar, and other Items you will probably want to center vertically:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(50)
@@ -119,7 +119,7 @@
       visible in the toolbar, instead of the default toolbar-styled back button:
         \qml
             import QtQuick 2.0
-            import Ubuntu.Components 1.0
+            import Ubuntu.Components 1.1
 
             MainView {
                 width: units.gu(50)

=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
--- modules/Ubuntu/Components/UbuntuListView.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/UbuntuListView.qml	2014-04-25 13:00:38 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 /*!
     \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A ListView with special features tailored for a look and feel fitting the
     Ubuntu Touch platform.
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-04-23 09:10:47 +0000
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-04-25 13:00:38 +0000
@@ -20,7 +20,7 @@
 
 /*!
     \qmltype UbuntuNumberAnimation
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
            settings to ensure that Ubuntu applications are consistent in their animations.
@@ -29,7 +29,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Rectangle {
         width: 100; height: 100

=== modified file 'modules/Ubuntu/Components/UbuntuShape.qml'
--- modules/Ubuntu/Components/UbuntuShape.qml	2014-04-23 09:10:47 +0000
+++ modules/Ubuntu/Components/UbuntuShape.qml	2014-04-25 13:00:38 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuShape
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The UbuntuShape item provides a standard Ubuntu shaped rounded rectangle.
 
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         UbuntuShape {
             color: "lightblue"
@@ -44,7 +44,7 @@
     \endqml
 
     \qml
-        import Ubuntu.Components 1.0
+        import Ubuntu.Components 1.1
 
         UbuntuShape {
             image: Image {

=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-25 13:00:38 +0000
@@ -30,7 +30,7 @@
 /*!
  * \qmltype i18n
  * \instantiates UbuntuI18n
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief i18n is a context property that provides internationalization support.
  *

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-23 22:36:54 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 /*!
   \qmltype InverseMouseArea
   \instantiates InverseMouseAreaType
-  \inqmlmodule Ubuntu.Components 1.0
+  \inqmlmodule Ubuntu.Components 1.1
   \ingroup ubuntu
   \brief The InverseMouseArea captures mouse events happening outside of a given
   area.
@@ -33,7 +33,7 @@
   Popup.qml
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 1.0
+  import Ubuntu.Components 1.1
 
   Rectangle {
       anchors.centerIn: parent
@@ -53,7 +53,7 @@
 
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 1.0
+  import Ubuntu.Components 1.1
 
   Item {
       width: 640
@@ -77,7 +77,7 @@
   a component which is either a parent of the mouse area or a sibling of it.
   \qml
   import QtQuick 2.0
-  import Ubuntu.Components 1.0
+  import Ubuntu.Components 1.1
 
   Item {
       width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/plugin/qquickclipboard.cpp'
--- modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2014-04-25 13:00:38 +0000
@@ -26,7 +26,7 @@
 /*!
  * \qmltype Clipboard
  * \instantiates QQuickClipboard
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief This is a singleton type providing access to the system clipboard.
  *

=== modified file 'modules/Ubuntu/Components/plugin/qquickmimedata.cpp'
--- modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-25 13:00:38 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype MimeData
  * \instantiates QQuickMimeData
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief MimeData type provides interface to access and store data to the
  * Clipboard.

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-25 13:00:38 +0000
@@ -219,7 +219,7 @@
 /*!
  * \qmltype Alarm
  * \instantiates UCAlarm
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-services
  * \brief Alarm component is a representation of an alarm event.
  *
@@ -237,7 +237,7 @@
  * Example usage:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 1.0
+ * import Ubuntu.Components 1.1
  *
  * Rectangle {
  *     width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-04-25 13:00:38 +0000
@@ -25,7 +25,7 @@
 /*!
  * \qmltype AlarmModel
  * \instantiates UCAlarmModel
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-services
  * \brief AlarmModel holds the list of alarms defined.
  *
@@ -39,7 +39,7 @@
  * Example usage:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 1.0
+ * import Ubuntu.Components 1.1
  * import Ubuntu.Components.ListItems 1.0
  * ListView {
  *     model: AlarmModel {}

=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp'
--- modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-04-25 13:00:38 +0000
@@ -27,7 +27,7 @@
 /*!
  * \qmltype UbuntuApplication
  * \instantiates UCApplication
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication.
  *

=== modified file 'modules/Ubuntu/Components/plugin/ucargument.cpp'
--- modules/Ubuntu/Components/plugin/ucargument.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucargument.cpp	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype Argument
  * \instantiates UCArgument
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-commandline
  * \brief The Argument class specifies what type a given command line parameter should be.
  *

=== modified file 'modules/Ubuntu/Components/plugin/ucarguments.cpp'
--- modules/Ubuntu/Components/plugin/ucarguments.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucarguments.cpp	2014-04-25 13:00:38 +0000
@@ -28,7 +28,7 @@
 /*!
  * \qmltype Arguments
  * \instantiates UCArguments
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-commandline
  * \brief The Arguments class provides a way to declare what command line
  *        parameters are expected by the application.

=== modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp'
--- modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype FontUtils
  * \instantiates UCFontUtils
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
  * which provides utility functions for font manipulations.
@@ -34,7 +34,7 @@
  * size:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 1.0
+ * import Ubuntu.Components 1.1
  *
  * Text {
  *     property string fontSize: "medium"
@@ -46,7 +46,7 @@
  * font unit size to scale its font:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 1.0
+ * import Ubuntu.Components 1.1
  *
  * TextInput {
  *     property string fontSize: "small"

=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-25 13:00:38 +0000
@@ -59,7 +59,7 @@
 /*!
    \qmltype Mouse
    \instantiates UCMouse
-   \inqmlmodule Ubuntu.Components 1.0
+   \inqmlmodule Ubuntu.Components 1.1
    \ingroup ubuntu
    \brief Attached property filtering mouse events occured inside the owner.
 
@@ -97,7 +97,7 @@
    released mouse buttons would look as follows:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    TextInput {
        width: 100
@@ -119,7 +119,7 @@
    Example of handling right button clicks over a TextInput:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    TextInput {
        width: 100
@@ -141,7 +141,7 @@
 
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    TextInput {
        width: 100
@@ -201,7 +201,7 @@
    will be printed as well as the proxied mouse press from the main item.
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    Item {
        id: main
@@ -254,7 +254,7 @@
    will be blocked by the MouseArea still.
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    MouseArea {
        id: topArea
@@ -289,7 +289,7 @@
    we make sure the TextInput always receives the events before the filter:
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    TextInput {
        id: input
@@ -316,7 +316,7 @@
 
    \qml
    import QtQuick 2.0
-   import Ubuntu.Components 1.0
+   import Ubuntu.Components 1.1
 
    TextInput {
        width: units.gu(40)
@@ -954,7 +954,7 @@
 /*!
    \qmltype InverseMouse
    \instantiates UCInverseMouse
-   \inqmlmodule Ubuntu.Components 1.0
+   \inqmlmodule Ubuntu.Components 1.1
    \ingroup ubuntu
    \brief Attached object filtering mouse events occured outside the owner.
 

=== modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-04-25 13:00:38 +0000
@@ -140,7 +140,7 @@
 /*!
  * \qmltype StateSaver
  * \instantiates UCStateSaverAttached
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-services
  * \brief Attached propertyes to save component property states.
  *
@@ -158,7 +158,7 @@
  * Example:
  * \qml
  * import QtQuick 2.0
- * import Ubuntu.Components 1.0
+ * import Ubuntu.Components 1.1
  *
  * TextField {
  *     id: input

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-25 13:00:38 +0000
@@ -36,7 +36,7 @@
 /*!
     \qmltype Theme
     \instantiates UCTheme
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup theming
     \brief The Theme class provides facilities to interact with the current theme.
 
@@ -48,7 +48,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Item {
         Button {
@@ -61,7 +61,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     StyledItem {
         id: myItem

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-25 13:00:38 +0000
@@ -21,7 +21,7 @@
 /*!
  * \qmltype UbuntuAnimation
  * \instantiates UCUbuntuAnimation
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief Singleton defining standard Ubuntu durations and easing for animations
  *        that should be used to ensure that Ubuntu applications are consistent

=== modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp'
--- modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-25 13:00:38 +0000
@@ -40,7 +40,7 @@
 /*!
     \qmltype Units
     \instantiates UCUnits
-    \inqmlmodule Ubuntu.Components 1.0
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup resolution-independence
     \brief Units of measurement for sizes, spacing, margin, etc.
 
@@ -52,7 +52,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 1.0
+    import Ubuntu.Components 1.1
 
     Item {
         width: units.gu(2)

=== modified file 'modules/Ubuntu/Components/plugin/ucurihandler.cpp'
--- modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-04-25 13:00:38 +0000
@@ -36,7 +36,7 @@
 /*!
  * \qmltype UriHandler
  * \instantiates UCUriHandler
- * \inqmlmodule Ubuntu.Components 1.0
+ * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu
  * \brief Singleton signalling for opened URIs.
  *

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Components/qmldir	2014-04-25 13:00:38 +0000
@@ -89,3 +89,6 @@
 ColorUtils 1.0 colorUtils.js
 DateUtils 1.0 dateUtils.js
 UbuntuListView 1.0 UbuntuListView.qml
+
+#version 1.1
+ComboButton 1.1 ComboButton.qml

=== modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml'
--- modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
 
 Item {

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-23 10:01:42 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*!
     \qmlabstract UbuntuTestCase

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-24 12:07:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-25 13:00:38 +0000
@@ -543,6 +543,32 @@
         self.checked.wait_for(not original_state, timeout)
 
 
+class ComboButton(UbuntuUIToolkitEmulatorBase):
+    """ComboButton Autopilot emulator."""
+
+    def press_mainbutton(self):
+        """Presses the main button of the ComboBox."""
+        main_button = self.select_single(objectName="combobutton_mainbutton")
+        self.pointing_device.click_object(main_button)
+
+    def expand(self):
+        """Expands a combo button by clicking on the dropdown button."""
+        if not self.expanded:
+            self._press_dropdown()
+        return self.expanded
+
+    def collapse(self):
+        """Collapses a combo button by clicking on the dropdown button."""
+        if self.expanded:
+            self._press_dropdown()
+        return self.expanded
+
+    def _press_dropdown(self):
+        """Presses the dropdown button to togle combo list expansion."""
+        dropdown_button = self.select_single(objectName="combobutton_dropdown")
+        return self.pointing_device.click_object(dropdown_button)
+
+
 class OptionSelector(UbuntuUIToolkitEmulatorBase):
     """OptionSelector Autopilot emulator"""
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-20 19:25:12 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-25 13:00:38 +0000
@@ -25,7 +25,7 @@
 
 DEFAULT_QML_FILE_CONTENTS = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-20 19:25:12 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-25 13:00:38 +0000
@@ -65,7 +65,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-23 22:36:54 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-25 13:00:38 +0000
@@ -72,7 +72,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -125,7 +125,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -148,7 +148,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(50)
@@ -244,7 +244,7 @@
 
 TEST_TABS_QML_FORMAT = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {{
     width: units.gu(70)
@@ -382,7 +382,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 MainView {
@@ -456,7 +456,7 @@
 
 TEST_QML_WITH_CHECKBOX = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -474,7 +474,7 @@
 
 TEST_QML_WITH_SWITCH = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -567,7 +567,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 MainView {
@@ -665,7 +665,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 MainView {
@@ -740,7 +740,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 
@@ -892,7 +892,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -947,7 +947,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -1020,7 +1020,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 MainView {
@@ -1091,11 +1091,78 @@
         self._assert_composer_sheet_is_closed()
 
 
+class ComboButtonTestCase(tests.QMLStringAppTestCase):
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(60)
+
+    Column {
+        anchors.fill: parent
+
+        ComboButton {
+            text: "main button"
+            objectName: "combo_button"
+            ListView {
+                model: 10
+                delegate: Standard {
+                    text: "Item #" + modelData
+                }
+            }
+        }
+        ComboButton {
+            text: "main button"
+            objectName: "autocollapse_button"
+            onClicked: expanded = false
+            ListView {
+                model: 10
+                delegate: Standard {
+                    text: "Item #" + modelData
+                }
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(ComboButtonTestCase, self).setUp()
+        self.combo = self.main_view.select_single(
+            emulators.ComboButton, objectName="combo_button")
+        self.autocombo = self.main_view.select_single(
+            emulators.ComboButton, objectName="autocollapse_button")
+        self.assertFalse(self.combo.expanded)
+        self.assertFalse(self.autocombo.expanded)
+
+    def test_expand_collapse_combo(self):
+        self.combo.expand()
+        self.assertTrue(self.combo.expanded)
+        self.combo.collapse()
+        self.assertFalse(self.combo.expanded)
+
+    def test_main_pressed(self):
+        self.combo.expand()
+        self.assertTrue(self.combo.expanded)
+        self.combo.press_mainbutton()
+        self.assertTrue(self.combo.expanded)
+
+    def test_autocollapse(self):
+        self.autocombo.expand()
+        self.assertTrue(self.autocombo.expanded)
+        self.autocombo.press_mainbutton()
+        self.assertFalse(self.autocombo.expanded)
+
+
 class OptionSelectorCustomDelegateTestCase(tests.QMLStringAppTestCase):
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
 
 MainView {
     width: units.gu(48)
@@ -1194,7 +1261,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)

=== modified file 'tests/resources/alarm/AlarmDays.qml'
--- tests/resources/alarm/AlarmDays.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/alarm/AlarmDays.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 

=== modified file 'tests/resources/alarm/Alarms.qml'
--- tests/resources/alarm/Alarms.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/alarm/Alarms.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 

=== added directory 'tests/resources/buttons'
=== added file 'tests/resources/buttons/ComboTest.qml'
--- tests/resources/buttons/ComboTest.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/buttons/ComboTest.qml	2014-04-25 13:00:38 +0000
@@ -0,0 +1,143 @@
+/*
+ * 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/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+
+    Column {
+        anchors.fill: parent
+        spacing: units.gu(2)
+
+        ComboButton {
+            id: combo1
+            text: "collapsedHeight differs"
+            collapsedHeight: units.gu(6)
+        }
+
+        ComboButton {
+            text: "content is Rectangle > expanded"
+            Rectangle {
+                height: units.gu(40)
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0.0
+                        color: "red"
+                    }
+                    GradientStop {
+                        position: 0.5
+                        color: "green"
+                    }
+                    GradientStop {
+                        position: 1.0
+                        color: "blue"
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            text: "comboList is Flickable"
+            Flickable {
+                id: flickable
+                objectName: "Flickable"
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    top: parent.top
+                }
+                contentHeight: rect.height
+
+                Rectangle {
+                    id: rect
+                    width: parent.width
+                    height: units.gu(40)
+                    gradient: Gradient {
+                        GradientStop {
+                            position: 0.0
+                            color: "red"
+                        }
+                        GradientStop {
+                            position: 0.5
+                            color: "green"
+                        }
+                        GradientStop {
+                            position: 1.0
+                            color: "blue"
+                        }
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: combo2
+            text: "comboList is ListView"
+            expanded: true
+            expandedHeight: units.gu(30)
+            UbuntuListView {
+                objectName: "ListView"
+                model: 20
+                delegate: Standard {
+                    text: "Action #" + modelData
+                    onClicked: {
+                        combo2.text = text;
+                        combo2.expanded = false
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: combo3
+            text: "auto expandHeight"
+            expandedHeight: -1
+            Column {
+                id: column
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                Rectangle {
+                    width: parent.width
+                    height: units.gu(6)
+                    color: "red"
+                }
+                Rectangle {
+                    width: parent.width
+                    height: units.gu(6)
+                    color: "green"
+                }
+                Rectangle {
+                    width: parent.width
+                    height: units.gu(6)
+                    color: "blue"
+                }
+                Rectangle {
+                    width: parent.width
+                    height: units.gu(6)
+                    color: "yellow"
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/resources/filters/MouseFilters.qml'
--- tests/resources/filters/MouseFilters.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/filters/MouseFilters.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(40)

=== modified file 'tests/resources/navigation/MyCustomPage.qml'
--- tests/resources/navigation/MyCustomPage.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/navigation/MyCustomPage.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Page {
     title: i18n.tr("My custom page")

=== modified file 'tests/resources/navigation/PageStack.qml'
--- tests/resources/navigation/PageStack.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/navigation/PageStack.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Rectangle {

=== modified file 'tests/resources/navigation/RepeaterTabs.qml'
--- tests/resources/navigation/RepeaterTabs.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/navigation/RepeaterTabs.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 
 MainView {

=== modified file 'tests/resources/navigation/SimpleTabs.qml'
--- tests/resources/navigation/SimpleTabs.qml	2014-04-23 22:36:54 +0000
+++ tests/resources/navigation/SimpleTabs.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: 800

=== modified file 'tests/resources/navigation/StackWithTabs.qml'
--- tests/resources/navigation/StackWithTabs.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/navigation/StackWithTabs.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     id: mainView

=== modified file 'tests/resources/navigation/TabView.qml'
--- tests/resources/navigation/TabView.qml	2014-04-23 18:14:56 +0000
+++ tests/resources/navigation/TabView.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 
 MainView {

=== modified file 'tests/resources/navigation/Tabs.qml'
--- tests/resources/navigation/Tabs.qml	2014-04-24 14:55:07 +0000
+++ tests/resources/navigation/Tabs.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 MainView {

=== modified file 'tests/resources/pickers/DatePickerTest.qml'
--- tests/resources/pickers/DatePickerTest.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/pickers/DatePickerTest.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Pickers 1.0
 
 MainView {

=== modified file 'tests/resources/pickers/PanelTest.qml'
--- tests/resources/pickers/PanelTest.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/pickers/PanelTest.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Pickers 1.0
 
 MainView {

=== modified file 'tests/resources/pickers/PickerTest.qml'
--- tests/resources/pickers/PickerTest.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/pickers/PickerTest.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Pickers 1.0
 
 MainView {

=== modified file 'tests/resources/popover/PopoverTest.qml'
--- tests/resources/popover/PopoverTest.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/popover/PopoverTest.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 

=== modified file 'tests/resources/statesaver/StateSaver.qml'
--- tests/resources/statesaver/StateSaver.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/statesaver/StateSaver.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     id: app

=== modified file 'tests/resources/toolbar/LockedToolbar.qml'
--- tests/resources/toolbar/LockedToolbar.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/toolbar/LockedToolbar.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(50)

=== modified file 'tests/resources/toolbar/oldToolbarWithActions.qml'
--- tests/resources/toolbar/oldToolbarWithActions.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/toolbar/oldToolbarWithActions.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(50)

=== modified file 'tests/resources/toolbar/panels.qml'
--- tests/resources/toolbar/panels.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/toolbar/panels.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Rectangle {
     color: "grey"

=== modified file 'tests/resources/toolbar/toolbar.qml'
--- tests/resources/toolbar/toolbar.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/toolbar/toolbar.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(50)

=== modified file 'tests/resources/urihandler/UriHandlerTest.qml'
--- tests/resources/urihandler/UriHandlerTest.qml	2014-04-20 19:25:12 +0000
+++ tests/resources/urihandler/UriHandlerTest.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: mainView

=== modified file 'tests/unit/tst_components/tst_CrossFadeImage.qml'
--- tests/unit/tst_components/tst_CrossFadeImage.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_CrossFadeImage.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "CrossFadeImage"

=== modified file 'tests/unit/tst_components/tst_abstractbutton.qml'
--- tests/unit/tst_components/tst_abstractbutton.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_abstractbutton.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "AbstractButtonAPI"

=== modified file 'tests/unit/tst_components/tst_action.qml'
--- tests/unit/tst_components/tst_action.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_action.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "ActionAPI"

=== modified file 'tests/unit/tst_components/tst_actionitem.qml'
--- tests/unit/tst_components/tst_actionitem.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_actionitem.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "ActionItemAPI"

=== modified file 'tests/unit/tst_components/tst_activityindicator.qml'
--- tests/unit/tst_components/tst_activityindicator.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_activityindicator.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "ActivityIndicatorAPI"

=== modified file 'tests/unit/tst_components/tst_button.qml'
--- tests/unit/tst_components/tst_button.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_button.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "ButtonAPI"
@@ -53,6 +53,10 @@
         compare(button.color,newColor,"Can set/get color")
     }
 
+    function test_font() {
+        verify(button.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs");
+    }
+
     function test_hovered() {
         compare(button.hovered,false,"Hovered is boolean and false by default")
     }

=== modified file 'tests/unit/tst_components/tst_checkbox.qml'
--- tests/unit/tst_components/tst_checkbox.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_checkbox.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_clipboard.qml'
--- tests/unit/tst_components/tst_clipboard.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_clipboard.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "ClipboardAPI"

=== modified file 'tests/unit/tst_components/tst_dateutils.qml'
--- tests/unit/tst_components/tst_dateutils.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_dateutils.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 /*
  Implementation note:

=== modified file 'tests/unit/tst_components/tst_fontutils.qml'
--- tests/unit/tst_components/tst_fontutils.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_fontutils.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "FontUtilsAPI"

=== modified file 'tests/unit/tst_components/tst_label.qml'
--- tests/unit/tst_components/tst_label.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_label.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "LabelAPI"

=== modified file 'tests/unit/tst_components/tst_listitems_singlecontrol.qml'
--- tests/unit/tst_components/tst_listitems_singlecontrol.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_listitems_singlecontrol.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_mainview.qml'
--- tests/unit/tst_components/tst_mainview.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_mainview.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "MainViewAPI"

=== modified file 'tests/unit/tst_components/tst_page.qml'
--- tests/unit/tst_components/tst_page.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_page.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     width: 200

=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
--- tests/unit/tst_components/tst_pagestack.qml	2014-04-23 18:14:56 +0000
+++ tests/unit/tst_components/tst_pagestack.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "PageStackAPI"

=== modified file 'tests/unit/tst_components/tst_plugin_ucunits.qml'
--- tests/unit/tst_components/tst_plugin_ucunits.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_plugin_ucunits.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "UCUnitsAPI"

=== modified file 'tests/unit/tst_components/tst_popups_actionselectionpopover.qml'
--- tests/unit/tst_components/tst_popups_actionselectionpopover.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_popups_actionselectionpopover.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_popups_composersheet.qml'
--- tests/unit/tst_components/tst_popups_composersheet.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_popups_composersheet.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_popups_defaultsheet.qml'
--- tests/unit/tst_components/tst_popups_defaultsheet.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_popups_defaultsheet.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_popups_dialog.qml'
--- tests/unit/tst_components/tst_popups_dialog.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_popups_dialog.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_popups_popover.qml'
--- tests/unit/tst_components/tst_popups_popover.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_popups_popover.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 
 TestCase {

=== modified file 'tests/unit/tst_components/tst_progressbar.qml'
--- tests/unit/tst_components/tst_progressbar.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_progressbar.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "ProgressBarAPI"

=== modified file 'tests/unit/tst_components/tst_quickutils.qml'
--- tests/unit/tst_components/tst_quickutils.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_quickutils.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'tests/unit/tst_components/tst_scrollbar.qml'
--- tests/unit/tst_components/tst_scrollbar.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_scrollbar.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "ScrollbarAPI"

=== modified file 'tests/unit/tst_components/tst_slider.qml'
--- tests/unit/tst_components/tst_slider.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_slider.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "SliderAPI"

=== modified file 'tests/unit/tst_components/tst_switch.qml'
--- tests/unit/tst_components/tst_switch.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_switch.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "SwitchAPI"

=== modified file 'tests/unit/tst_components/tst_tab.qml'
--- tests/unit/tst_components/tst_tab.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_tab.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
      name: "TabAPI"

=== modified file 'tests/unit/tst_components/tst_toolbaritems.qml'
--- tests/unit/tst_components/tst_toolbaritems.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_toolbaritems.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     width: 200

=== modified file 'tests/unit/tst_components/tst_ubuntushape.qml'
--- tests/unit/tst_components/tst_ubuntushape.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_components/tst_ubuntushape.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "UbuntuShapeAPI"

=== modified file 'tests/unit/tst_i18n/src/LocalizedApp.qml'
--- tests/unit/tst_i18n/src/LocalizedApp.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_i18n/src/LocalizedApp.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)

=== modified file 'tests/unit/tst_mainview/AppName.qml'
--- tests/unit/tst_mainview/AppName.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_mainview/AppName.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     objectName: "appName"

=== modified file 'tests/unit/tst_mainview/LocalStorage.qml'
--- tests/unit/tst_mainview/LocalStorage.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_mainview/LocalStorage.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import QtQuick.LocalStorage 2.0
 
 MainView {

=== modified file 'tests/unit/tst_mainview/PageStack.qml'
--- tests/unit/tst_mainview/PageStack.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_mainview/PageStack.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     objectName: "pageStack"

=== modified file 'tests/unit/tst_mainview/PageTitle.qml'
--- tests/unit/tst_mainview/PageTitle.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_mainview/PageTitle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     objectName: "pageTitle"

=== modified file 'tests/unit/tst_mainview/TabsTitle.qml'
--- tests/unit/tst_mainview/TabsTitle.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_mainview/TabsTitle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     objectName: "tabsTitle"

=== modified file 'tests/unit/tst_page/AnchorToPage.qml'
--- tests/unit/tst_page/AnchorToPage.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_page/AnchorToPage.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(20)

=== modified file 'tests/unit/tst_performance/ButtonGrid.qml'
--- tests/unit/tst_performance/ButtonGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/ButtonGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/ButtonStyleGrid.qml'
--- tests/unit/tst_performance/ButtonStyleGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/ButtonStyleGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/CheckBoxGrid.qml'
--- tests/unit/tst_performance/CheckBoxGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/CheckBoxGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/CheckBoxStyleGrid.qml'
--- tests/unit/tst_performance/CheckBoxStyleGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/CheckBoxStyleGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/LabelGrid.qml'
--- tests/unit/tst_performance/LabelGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/LabelGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Grid {
     width: 800

=== modified file 'tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml'
--- tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Grid {
     width: 800

=== modified file 'tests/unit/tst_performance/SliderGrid.qml'
--- tests/unit/tst_performance/SliderGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/SliderGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/SliderStyleGrid.qml'
--- tests/unit/tst_performance/SliderStyleGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/SliderStyleGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/SwitchGrid.qml'
--- tests/unit/tst_performance/SwitchGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/SwitchGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/SwitchStyleGrid.qml'
--- tests/unit/tst_performance/SwitchStyleGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/SwitchStyleGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 Grid {

=== modified file 'tests/unit/tst_performance/TextWithImport.qml'
--- tests/unit/tst_performance/TextWithImport.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/TextWithImport.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Text {
 }

=== modified file 'tests/unit/tst_performance/UbuntuShapeGrid.qml'
--- tests/unit/tst_performance/UbuntuShapeGrid.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_performance/UbuntuShapeGrid.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Grid {
     width: 800

=== modified file 'tests/unit/tst_qmltemplate/tst_example_benchmark.qml'
--- tests/unit/tst_qmltemplate/tst_example_benchmark.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_benchmark.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 TestCase {
     name: "ExampleBenchmarkObject"

=== modified file 'tests/unit/tst_qmltemplate/tst_example_checks.qml'
--- tests/unit/tst_qmltemplate/tst_example_checks.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_checks.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== modified file 'tests/unit/tst_qmltemplate/tst_example_keyboard.qml'
--- tests/unit/tst_qmltemplate/tst_example_keyboard.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_keyboard.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== modified file 'tests/unit/tst_qmltemplate/tst_example_mouse.qml'
--- tests/unit/tst_qmltemplate/tst_example_mouse.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_mouse.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== modified file 'tests/unit/tst_qmltemplate/tst_example_property.qml'
--- tests/unit/tst_qmltemplate/tst_example_property.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_property.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== modified file 'tests/unit/tst_qmltemplate/tst_example_signals.qml'
--- tests/unit/tst_qmltemplate/tst_example_signals.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_qmltemplate/tst_example_signals.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== modified file 'tests/unit/tst_theme/tst_popoverforegroundstyle.qml'
--- tests/unit/tst_theme/tst_popoverforegroundstyle.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_theme/tst_popoverforegroundstyle.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 import Ubuntu.Components.Popups 1.0
 

=== modified file 'tests/unit/tst_ubuntu_shape/no_distortion.qml'
--- tests/unit/tst_ubuntu_shape/no_distortion.qml	2014-04-20 19:25:12 +0000
+++ tests/unit/tst_ubuntu_shape/no_distortion.qml	2014-04-25 13:00:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     width: 900

=== modified file 'tests/unit_x11/tst_components/tst_alarms.qml'
--- tests/unit_x11/tst_components/tst_alarms.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_alarms.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     id: root

=== added file 'tests/unit_x11/tst_components/tst_combobutton.qml'
--- tests/unit_x11/tst_components/tst_combobutton.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_combobutton.qml	2014-04-25 13:00:38 +0000
@@ -0,0 +1,244 @@
+/*
+ * 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 QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        ComboButton {
+            id: combo
+        }
+
+        ComboButton {
+            id: rectCombo
+            onClicked: expanded = false
+
+            Rectangle {
+                id: rect
+                width: parent.width
+                height: units.gu(40)
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0.0
+                        color: "red"
+                    }
+                    GradientStop {
+                        position: 0.5
+                        color: "green"
+                    }
+                    GradientStop {
+                        position: 1.0
+                        color: "blue"
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: columnCombo
+            expandedHeight: -1
+            Column {
+                id: column
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: childrenRect.height
+                Repeater {
+                    model: 5
+                    Rectangle {
+                        width: parent.width
+                        height: units.gu(5)
+                        color: Qt.rgba(Math.random(1), Math.random(1), Math.random(1), 1);
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: longCombo
+            expandedHeight: units.gu(40)
+            Rectangle {
+                id: longRect
+                height: units.gu(10)
+                color: "cyan"
+            }
+        }
+
+        ComboButton {
+            id: listCombo
+            ListView {
+                id: list
+                model: 20
+                height: listCombo.comboListHeight
+                delegate: Standard {
+                    text: modelData
+                }
+            }
+        }
+    }
+
+    SignalSpy { id: spy }
+
+    UbuntuTestCase {
+        name: "ComboButton"
+        when: windowShown
+
+        function cleanup() {
+            rectCombo.expanded =
+            columnCombo.expanded =
+            longCombo.expanded =
+            listCombo.expanded = false;
+            spy.clear();
+            spy.signalName = "";
+            spy.target = undefined;
+        }
+
+        function test_0_defaults() {
+            compare(combo.expanded, false, "not expanded by default");
+            compare(combo.collapsedHeight, combo.implicitHeight, "collapsedHeight is implicitHeight");
+            compare(combo.expandedHeight, combo.collapsedHeight + units.gu(19.5), "expanded height default");
+            var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin;
+            compare(combo.comboListHeight, lheight, "comboListHeight default");
+            compare(combo.comboList.length, 0, "comboList is empty");
+            verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs.");
+            verify(combo.dropdownColor === combo.__styleInstance.defaultDropdownColor, "Default dropdown color differs");
+        }
+
+        function test_dropdownColor() {
+            rectCombo.dropdownColor = rectCombo.expanded ? "red" : "green";
+            rectCombo.expanded = false;
+            var dropdownFace = findChild(rectCombo, "combobutton_dropdown_visuals");
+            verify(dropdownFace, "Dropdown button visuals cannot be reached");
+            verify(dropdownFace.color === rectCombo.dropdownColor, "Dropdon color when collapsed wrong");
+            rectCombo.expanded = true;
+            waitForRendering(rectCombo);
+            verify(dropdownFace.color === rectCombo.dropdownColor, "Dropdon color when expanded wrong");
+        }
+
+        function test_comboListWidth() {
+            var comboListHolder = findChild(rectCombo, "combobutton_combolist");
+            compare(rect.width, comboListHolder.width, "rectCombo list content width is not adjusted");
+            comboListHolder = findChild(columnCombo, "combobutton_combolist");
+            compare(column.width, comboListHolder.width, "columnCombo list content width is not adjusted");
+            comboListHolder = findChild(longCombo, "combobutton_combolist");
+            compare(longRect.width, comboListHolder.width, "longCombo list content width is not adjusted");
+            comboListHolder = findChild(listCombo, "combobutton_combolist");
+            compare(list.width, comboListHolder.width, "listCombo list content width is not adjusted");
+        }
+
+        function test_expandRectComboThroughProperty() {
+            rectCombo.expanded = true;
+            waitForRendering(rectCombo);
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+        }
+
+        function test_expandRectComboThroughClick() {
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, true, "combo is not expanded");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+        }
+
+        function test_autoCollapse() {
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, true, "combo is not expanded");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+
+            mouseClick(rectCombo, rectCombo.width / 2, rectCombo.collapsedHeight / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, false, "combo is not collapsed");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0);
+        }
+
+        function test_flickRectCombo() {
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            var comboList = findChild(rectCombo, "combobutton_combolist");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            verify(comboList.height > rectCombo.expandedHeight);
+            // comboList flicker is the combolist parent's parent
+            var comboListFlicker = comboList.parent.parent;
+            compare(comboListFlicker.interactive, true, "combo list holder must be interactive");
+
+            // drag the rectangle, the Flickable should be moving
+            var x = comboListFlicker.width / 2;
+            var y = comboListFlicker.height / 2;
+            var dy = comboListFlicker.height / 6;
+            spy.target = comboListFlicker;
+            spy.signalName = "onMovementEnded";
+            mouseDrag(comboListFlicker, x, y, x, dy);
+            waitForRendering(comboListFlicker);
+            compare(spy.count, 1, "combo list content did not move");
+        }
+
+        function test_autoExpandHeight() {
+            var comboListPanel = findChild(columnCombo, "combobutton_combopanel");
+            var comboList = findChild(columnCombo, "combobutton_combolist");
+            columnCombo.expanded = true;
+            waitForRendering(columnCombo);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            var comboListFlicker = comboList.parent.parent;
+            compare(comboListFlicker.interactive, false, "combo list holder must not be interactive");
+            compare(comboListFlicker.height, columnCombo.comboListHeight, "combo list height differs from the holder height");
+        }
+
+        function test_emptyComboExpanded() {
+            var comboListPanel = findChild(combo, "combobutton_combopanel");
+            var comboList = findChild(combo, "combobutton_combolist");
+            combo.expanded = true;
+            waitForRendering(combo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0, 1000);
+        }
+
+        function test_longCombo() {
+            var comboListPanel = findChild(longCombo, "combobutton_combopanel");
+            var comboList = findChild(longCombo, "combobutton_combolist");
+            longCombo.expanded = true;
+            waitForRendering(longCombo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            verify(comboListPanel.height < longCombo.expandedHeight);
+        }
+
+        function test_listCombo() {
+            var comboListPanel = findChild(listCombo, "combobutton_combopanel");
+            var comboList = findChild(listCombo, "combobutton_combolist");
+            listCombo.expanded = true;
+            waitForRendering(listCombo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+
+            compare(list.height, comboList.height, "list and comboList height differs");
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_datepicker.qml'
--- tests/unit_x11/tst_components/tst_datepicker.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_datepicker.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Pickers 1.0
 
 Item {

=== modified file 'tests/unit_x11/tst_components/tst_dialer.qml'
--- tests/unit_x11/tst_components/tst_dialer.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_dialer.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Pickers 1.0
 
 Item {

=== modified file 'tests/unit_x11/tst_components/tst_expandable.qml'
--- tests/unit_x11/tst_components/tst_expandable.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_expandable.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'tests/unit_x11/tst_components/tst_expandablescolumn.qml'
--- tests/unit_x11/tst_components/tst_expandablescolumn.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_expandablescolumn.qml	2014-04-25 13:00:38 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'tests/unit_x11/tst_components/tst_header.qml'
--- tests/unit_x11/tst_components/tst_header.qml	2014-04-20 19:25:12 +0000
+++ tests/unit_x11/tst_components/tst_header.qml	2014-04-25 13:00:38 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 
 Item {
     width: units.gu(50)

=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-23 18:14:56 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-25 13:00:38 +0000