Merge lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fix import versions in entire UITK and examples. Move example code under 1.3 folder.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1502
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1706/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/434/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/433/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2442/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1503
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1707/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2447
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/435
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/437
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/437/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/434/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2445
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19921

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1505
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1708/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2448
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/436
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/438
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/438/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/435/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2446
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19924

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1506
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1710/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2456
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/438
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/440
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/440/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/437/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19931

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

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:./themes");

255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");

This seems wrong. These tests ensure that themes are loaded without any defined variables, ie. all packaged click apps run that way. By passing the custom themes folder we no longer test that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1711/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2464
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/439
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/441
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/441/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/438
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2462
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19941

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

> 247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
> 247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:./themes");
>
> 255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
> 255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
>
> This seems wrong. These tests ensure that themes are loaded without any
> defined variables, ie. all packaged click apps run that way. By passing the
> custom themes folder we no longer test that.

There was a problem that there was the TestModule.TestTheme folder which was in conflict with the shared theme under themes. I thought that was a mistake, but seems not - I copied these tests from the old theming, and back then there was no problems as there was no need for versioning support, which would have had to differentiate the shared and app themes. Now we have.

OTOH, the theming was always running so that having UBUNTU_UI_TOOLKIT_THEMES_PATH set will override XDG_DATA_DIRS and will add whatever path you have to the shared theme lookup paths. So, setting a value of "." actually does affect the theme loading and overrides whatever you have in XDG_DATA_DIRS. I guess that was the intention, otherwise the test is wrong.

I will get the removed app theme back with a different name so we have the test back.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1511
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1713/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/443
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/443/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/440/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2474
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2474/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19958

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1512
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1714/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2477/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2475/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1512
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1718/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/448/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/445/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2483/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1513
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1721/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/451
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/448
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2514
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2514/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20004

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

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

file:///tmp/tmplf7fdt7n.qml:11:9: QML CheckBox: Warning: Style CheckBoxStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:124:9: QML AppHeader: Warning: Style HeaderStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:35:5: QML StyledItem: Warning: Style MainViewStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Toolbar.qml:121:5: QML StyledItem: Warning: Style ToolbarStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:42: TypeError: Cannot read property 'normal' of null
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/PageHeadConfiguration11.qml:54: TypeError: Cannot read property 'selected' of null
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:188: TypeError: Cannot read property '__tabBar' of null

review: Needs Fixing

[Zsombor Egri (zsombi)]

> file:///tmp/tmplf7fdt7n.qml:11:9: QML CheckBox: Warning: Style
> CheckBoxStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:124:9: QML AppHeader:
> Warning: Style HeaderStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:35:5: QML StyledItem:
> Warning: Style MainViewStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/Toolbar.qml:121:5: QML StyledItem:
> Warning: Style ToolbarStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:42: TypeError: Cannot
> read property 'normal' of null
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/PageHeadConfiguration11.qml:54: TypeError:
> Cannot read property 'selected' of null
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:188: TypeError: Cannot read
> property '__tabBar' of null

What the heck??! Why does it fail on autopilot and has nothing elsewhere?!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1513
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1724/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2557
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/454
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/451
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2555
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20068

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1514
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1725/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/455
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/452
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2556
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2556/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20070

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1514
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1726/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2559
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/456
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/453
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20071

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1515
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1727/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/457
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/454
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2562
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2562/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20079

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1516
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1728/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/458
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/458/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/455
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20088

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1517
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1729/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2579
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/459
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/456
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2577
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20104

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1518
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1730/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2594/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/460/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2592/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1519
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1731/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2606/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/459/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/461/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2604/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1520
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1732/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/462
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/462/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/459
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2613
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20150

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1522
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1733/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/463
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/460
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2614
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2614/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20151

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1522
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1734/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/464
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/464/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/461
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2617
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20162

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

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

why examples/1.3? seems a bit pointless if we won't have any old ones

- 191 return QUrl::fromLocalFile(absoluteThemeFolder);
+ 189 record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
+ 190 record.path = QUrl::fromLocalFile(absoluteThemeFolder);
+ 191 break;

At first glance this seems a bit ugly, though I can live with it. I think we should have a bug about adding this flag to theme meta data eventually - which we'll need once third party themes can be installed and then we won't need this magic file anymore.

+ 706 qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")

Should/ could we have a specific warning about the theme being deprecated? So it's clear to an app developer that for instance they should stop using SuruGradient, and not just ponder why it's "incomplete".

review: Needs Information

[Zsombor Egri (zsombi)]

> why examples/1.3? seems a bit pointless if we won't have any old ones

The next MR brings examples 1.2 also. The gallery will have to adapt as well.

>
> - 191 return QUrl::fromLocalFile(absoluteThemeFolder);
> + 189 record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
> + 190 record.path = QUrl::fromLocalFile(absoluteThemeFolder);
> + 191 break;
>
> At first glance this seems a bit ugly, though I can live with it. I think we
> should have a bug about adding this flag to theme meta data eventually - which
> we'll need once third party themes can be installed and then we won't need
> this magic file anymore.

Yeah, I think we should really need a theme descriptor file, where we can have all sorts of things declared. The deprecated file will vanish once we reach 2.0, and we will only have 2 themes.
>
> + 706 qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for
> version %3.%4, fall back to version %5.%6.")
>
> Should/ could we have a specific warning about the theme being deprecated? So
> it's clear to an app developer that for instance they should stop using
> SuruGradient, and not just ponder why it's "incomplete".

Yeah, good point. I'll add a note to that, but perhaps at the setName() time, so it only shows once, not for every component creating the style components.

[Christian Dywan (kalikiana)]

Alright, we're good then. The qmlinfo tweak isn't essential. Let's see that we sort out those odd Mir failures.

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/923/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/230
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/230/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/230

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

It seems like some corruption is going on, "test_tst_listitem.qml.xml was length 0" and another supposed failure in x11_tst_mousefilters which suggests that QuickUtils::instance().inputMethodProvider() isn't finding the OSK which depends on the image preinstalling maliit. Let's try again.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1522
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1737/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/467
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/464
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2623
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20170

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

review: Needs Fixing (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-04-25 05:31:43 +0000
+++ components.api	2015-05-02 11:10:54 +0000
@@ -246,7 +246,7 @@
     property Flickable flickable
     property list<Action> actions
 Page 1.1
-Toolkit10.Page
+Page10
     readonly property PageHeadConfiguration head
 Page 1.3
 PageTreeNode

=== modified file 'debian/ubuntu-ui-toolkit-theme.install'
--- debian/ubuntu-ui-toolkit-theme.install	2013-06-26 22:44:07 +0000
+++ debian/ubuntu-ui-toolkit-theme.install	2015-05-02 11:10:54 +0000
@@ -1,1 +1,17 @@
-usr/lib/*/qt5/qml/Ubuntu/Components/Themes
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/parent_theme
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/deprecated
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/parent_theme
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/*.qml

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-04-17 07:39:12 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-05-02 11:10:54 +0000
@@ -11,7 +11,7 @@
 sourcedirs += ../modules/Ubuntu/Test
 headerdirs += ../modules/Ubuntu/Test/plugin
 exampledirs += snippets
-exampledirs += ../examples
+exampledirs += ../examples/1.3
 exampledirs += ../modules/Ubuntu/Components
 excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
 excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark

=== added directory 'examples/1.3'
=== added file 'examples/1.3/1.3.pro'
--- examples/1.3/1.3.pro	1970-01-01 00:00:00 +0000
+++ examples/1.3/1.3.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,10 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \ 
+    ubuntu-ui-toolkit-gallery\
+    locale \
+    jokes \
+    unit-converter \
+    calculator \
+    customtheme
+

=== renamed directory 'examples/calculator' => 'examples/1.3/calculator'
=== modified file 'examples/1.3/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/calculator/calculator.qml	2015-05-02 11:10:54 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator

=== modified file 'examples/1.3/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/calculator/components/DefaultLayout.qml	2015-05-02 11:10:54 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Layouts 1.0
 
 Item {

=== modified file 'examples/1.3/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/calculator/components/Functions.qml	2015-05-02 11:10:54 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Layouts 1.0
 
 Grid {

=== renamed directory 'examples/customtheme' => 'examples/1.3/customtheme'
=== renamed directory 'examples/jokes' => 'examples/1.3/jokes'
=== modified file 'examples/1.3/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/jokes/jokes.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtMultimedia 5.0
 
 /*!

=== renamed directory 'examples/locale' => 'examples/1.3/locale'
=== renamed directory 'examples/ubuntu-ui-toolkit-gallery' => 'examples/1.3/ubuntu-ui-toolkit-gallery'
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml'
--- examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: circle

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml'
--- examples/ubuntu-ui-toolkit-gallery/Animations.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "animationsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 Template {

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "colorsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml'
--- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-03-11 17:10:20 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "crossFadeImagesTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-03-11 17:10:20 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Template {

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 1.0
 import Qt.labs.folderlistmodel 2.1

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "labelsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-02-18 11:16:32 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     property alias text: label.text

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 TemplateSection {
     id: section

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml'
--- examples/ubuntu-ui-toolkit-gallery/Navigation.qml	2015-03-05 09:35:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "navigationTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-02-25 14:14:05 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "listItemsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-03-11 17:10:20 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "optionSelectorsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml'
--- examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-03-11 17:10:20 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 0.1
 
 Template {

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-03-12 09:15:35 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "progressBarsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-03-11 17:10:20 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 0.1
 
 Template {

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-20 21:25:13 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "slidersTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: template

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateFlow.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: templateFlow

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: templateRow

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Column {
     id: templateSection

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Column {
     id: templateSection

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml'
--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-03-10 11:49:27 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "textinputsTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Toggles.qml	2015-03-03 13:20:06 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "togglesTemplate"

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml'
--- examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-04-01 08:44:56 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Label {
     id: webLink

=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 MainView {
@@ -26,8 +26,6 @@
     // Note! applicationName needs to match the .desktop filename
     applicationName: "ubuntu-ui-toolkit-gallery"
 
-    useDeprecatedToolbar: false
-
     width: units.gu(120)
     height: units.gu(75)
 
@@ -145,9 +143,6 @@
                              selectedWidget = null;
                          }
 
-        ToolbarItems{ id: defTools}
-        tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : defTools
-
         Loader {
             id: contentLoader
             objectName: "contentLoader"

=== renamed directory 'examples/unit-converter' => 'examples/1.3/unit-converter'
=== modified file 'examples/1.3/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2015-03-03 13:47:48 +0000
+++ examples/1.3/unit-converter/unit-converter.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "conversion.js" as Converter
 
 /*!
@@ -140,13 +140,12 @@
                     }
                 }
             }
-            tools: ToolbarActions {
-                Action {
-                    objectName: "action"
-                    iconSource: Qt.resolvedUrl("toolbarIcon.png")
-                    text: i18n.tr("Clear")
-                    onTriggered: Converter.clear(converter)
-                }
+
+            head.actions: Action {
+                objectName: "action"
+                iconName: "clear"
+                text: i18n.tr("Clear")
+                onTriggered: Converter.clear(converter)
             }
         }
     }

=== modified file 'examples/examples.pro'
--- examples/examples.pro	2015-04-15 12:03:50 +0000
+++ examples/examples.pro	2015-05-02 11:10:54 +0000
@@ -1,11 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \ 
-    ubuntu-ui-toolkit-gallery\
-    locale \
-    unit-converter \
-    calculator \
-    customtheme
+    1.3
 
 
 #examples = jokes unit-converter

=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ActionList

=== modified file 'modules/Ubuntu/Components/Captions.qml'
--- modules/Ubuntu/Components/Captions.qml	2015-03-03 14:23:22 +0000
+++ modules/Ubuntu/Components/Captions.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
   \qmltype Captions
@@ -37,7 +37,7 @@
 
   \qml
   import QtQuick 2.4
-  import Ubuntu.Components 1.2
+  import Ubuntu.Components 1.3
 
   ListItem {
       RowLayout {

=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2015-05-02 11:10:54 +0000
@@ -42,7 +42,7 @@
         list will be expanded only to the height of the content.
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         ComboButton {
             text: "smaller content"
             Rectangle {
@@ -58,7 +58,7 @@
         itself.
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         ComboButton {
             text: "long scrolled content"
             Column {
@@ -77,7 +77,7 @@
         the content will be filling the entire combo list area defined.
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0
         ComboButton {
             text: "listview"
@@ -95,7 +95,7 @@
         bind its height to the \l comboListHeight property.
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         ComboButton {
             id: combo
             text: "smaller content"
@@ -109,7 +109,7 @@
         expandedHeight should be set to -1.
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         ComboButton {
             text: "auto-sized content"
             expandedHeight: -1
@@ -135,7 +135,7 @@
 
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
 
     ComboButton {
         id: combo
@@ -202,7 +202,7 @@
       that can be used to size the combo list content.
       \qml
       import QtQuick 2.4
-      import Ubuntu.Components 1.2
+      import Ubuntu.Components 1.3
       import Ubuntu.Components.ListItems 0.1
       ComboButton {
           id: combo

=== modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml'
--- modules/Ubuntu/Components/CrossFadeImage10.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/CrossFadeImage10.qml	2015-05-02 11:10:54 +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.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml'
--- modules/Ubuntu/Components/CrossFadeImage11.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/CrossFadeImage11.qml	2015-05-02 11:10:54 +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.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   This component is a unified text selection and scrolling handler for both

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Base

=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
--- modules/Ubuntu/Components/ListItems/Divider.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Divider

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-05-02 11:10:54 +0000
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2015-05-02 11:10:54 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Expandable
@@ -35,7 +35,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ExpandablesColumn
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {

=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // internal helper class to create the visuals
 // for the icon.

=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -27,7 +27,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         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	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-05-02 11:10:54 +0000
@@ -31,7 +31,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         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	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype MultiValue

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-03-20 11:40:48 +0000
+++ modules/Ubuntu/Components/MainView.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,6 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
@@ -137,7 +136,7 @@
             flickable: internal.activePage ? internal.activePage.flickable : null
             pageStack: internal.activePage ? internal.activePage.pageStack : null
 
-            Toolkit.PageHeadConfiguration {
+            PageHeadConfiguration11 {
                 id: headerConfig
                 // for backwards compatibility with deprecated tools property
                 actions: internal.activePage ?
@@ -243,8 +242,8 @@
         id: internal
 
         // Even when using MainView 1.1, we still support Page 1.0.
-        // PageBase (=Page 1.0) is the superclass of Page 1.1.
-        property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
+        // we use PageTreeNode being the base class of all pages.
+        property PageTreeNode activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
 
         function isPage(item) {
             return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&

=== modified file 'modules/Ubuntu/Components/MainView12.qml'
--- modules/Ubuntu/Components/MainView12.qml	2015-03-20 11:40:48 +0000
+++ modules/Ubuntu/Components/MainView12.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.2
 

=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-05-02 11:10:54 +0000
@@ -27,7 +27,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         Column {
             spacing: units.gu(3)
 

=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-05-02 11:10:54 +0000
@@ -22,7 +22,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         Column {
             width: 250
             OptionSelector {
@@ -43,7 +43,7 @@
 
 import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 ListItem.Empty {
     id: option

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-03-06 07:55:23 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype OrientationHelper

=== modified file 'modules/Ubuntu/Components/Page10.qml'
--- modules/Ubuntu/Components/Page10.qml	2015-03-20 11:05:40 +0000
+++ modules/Ubuntu/Components/Page10.qml	2015-05-02 11:10:54 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+// FIXME must merge Page10, Page11 and Page13 files
 import Ubuntu.Components 1.0 as Toolkit
 import "pageUtils.js" as Utils
 

=== modified file 'modules/Ubuntu/Components/Page11.qml'
--- modules/Ubuntu/Components/Page11.qml	2015-03-23 16:13:33 +0000
+++ modules/Ubuntu/Components/Page11.qml	2015-05-02 11:10:54 +0000
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.0 as Toolkit10
+// FIXME must merge Page10, Page11 and Page13 files
 import Ubuntu.Components 1.1 as Toolkit11
 
 /*! \internal */
 // Documentation in Page.qdoc
-Toolkit10.Page {
+Page10 {
     id: page
     /*!
       \qmlproperty PageHeadConfiguration head

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration13.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-03-20 12:01:19 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-05-02 11:10:54 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.2 as Toolkit12
+import Ubuntu.Components 1.3 as Toolkit12
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/PageHeadSections.qml'
--- modules/Ubuntu/Components/PageHeadSections.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/PageHeadSections.qml	2015-05-02 11:10:54 +0000
@@ -39,7 +39,7 @@
     /*!
       List of strings that represent section names. Example:
       \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import QtQuick 2.4
 
         MainView {

=== modified file 'modules/Ubuntu/Components/PageHeadState.qml'
--- modules/Ubuntu/Components/PageHeadState.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PageHeadState.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 // for Action
+import Ubuntu.Components 1.3 // for Action
 
 /*!
     \qmltype PageHeadState
@@ -29,7 +29,7 @@
    enables the user to enter search/input mode:
    \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             id: mainView

=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2015-03-16 21:23:41 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2015-05-02 11:10:54 +0000
@@ -37,7 +37,7 @@
     undefined:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             width: units.gu(40)
@@ -76,7 +76,7 @@
     Example:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/Panel.qml	2015-05-02 11:10:54 +0000
@@ -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.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         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.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         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.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         Rectangle {
             color: theme.palette.normal.background

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-05-02 11:10:54 +0000
@@ -36,7 +36,7 @@
 
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     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.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     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.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.Pickers 1.0
 
     Column {
@@ -112,7 +112,7 @@
     \endlist
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.Pickers 1.0
 
     Column {

=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     circular: true

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-05-02 11:10:54 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
   \internal

=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     circular: (count >= 11)

=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-05-02 11:10:54 +0000
@@ -35,7 +35,7 @@
     Example:
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.Pickers 1.0
 
     Picker {

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-05-02 11:10:54 +0000
@@ -33,7 +33,7 @@
     on date pickers.
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
 
     MainWindow {
         width: units.gu(40)

=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Row {
     id: row

=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     property int from

=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PickerModelBase {
     // local properties

=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
@@ -32,7 +32,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype DefaultSheet
@@ -33,7 +33,7 @@
 
     Example:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-05-02 11:10:54 +0000
@@ -33,7 +33,7 @@
     Example:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.Popups 1.0
 
         Item {

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-05-02 11:10:54 +0000
@@ -32,7 +32,7 @@
     Example:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         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	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PopupBase

=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
--- modules/Ubuntu/Components/PullToRefresh.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-05-02 11:10:54 +0000
@@ -34,7 +34,7 @@
     \qml
     import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -84,7 +84,7 @@
     \qml
     import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.ListItems 1.0
 
     MainView {
@@ -132,7 +132,7 @@
     \qml
     import QtQuick 2.4
     import QtQuick.XmlListModel 2.0
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
     import Ubuntu.Components.ListItems 1.0
 
     MainView {

=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2015-04-08 16:21:42 +0000
+++ modules/Ubuntu/Components/Tab.qml	2015-05-02 11:10:54 +0000
@@ -51,7 +51,7 @@
       Example:
       \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         MainView {
             width: units.gu(40)
             height: units.gu(50)

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2015-03-16 21:23:41 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2015-05-02 11:10:54 +0000
@@ -31,7 +31,7 @@
     Example:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
@@ -102,7 +102,7 @@
 
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             id: mainView

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-05-02 11:10:54 +0000
@@ -527,7 +527,7 @@
 
       \qml
       import QtQuick 2.4
-      import Ubuntu.Components 1.2
+      import Ubuntu.Components 1.3
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true

=== added file 'modules/Ubuntu/Components/Themes/1.2/1.2.pro'
--- modules/Ubuntu/Components/Themes/1.2/1.2.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/1.2/1.2.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,16 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
+
+message(Theme install path $$installPath)
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== added file 'modules/Ubuntu/Components/Themes/1.3/1.3.pro'
--- modules/Ubuntu/Components/Themes/1.3/1.3.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/1.3/1.3.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,14 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro'
--- modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,14 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.Ambiance
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,14 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.Ambiance
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Image {
     id: container

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-05-02 11:10:54 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: buttonForeground

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-05-02 11:10:54 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: buttonStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.2 as Style
 
 Style.ComboButtonStyle {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtGraphicalEffects 1.0
 
 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: dialogForegroundStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: ambianceStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-05-02 11:10:54 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     // styling properties

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: ambianceStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-04-24 14:34:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes 1.3
 
 Palette {
@@ -34,7 +34,7 @@
     selected {
         background: Qt.rgba(0, 0, 0, 0.05)
         backgroundText: UbuntuColors.darkGrey
-        selection: selected.foreground // unused
+        selection: selected.foreground
         foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
         foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     property real minFade: 0.2

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: progressionVisualStyle

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.2 as Style
 
 Style.PullToRefreshStyle {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: visuals

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // FIXME : move the API into Ubuntu.Components.Style
 Item {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: visuals

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-04-24 14:43:08 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-05-02 11:10:54 +0000
@@ -1,23 +1,5 @@
-TEMPLATE = aux
-
-CONFIG+=ubuntu_qml_module
-
-uri = Ubuntu.Components.Themes.Ambiance
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-
-QMLDIR_FILE = qmldir
-QML_FILES = ./1.2/*.qml ./1.3/*.qml
-ARTWORK_FILES += artwork/*.png \
-                 artwork/*.svg \
-                 artwork/*.sci
-
-qmldir_file.installPath = $$installPath
-qmldir_file.files = $$QMLDIR_FILE
-
-qml_files.installPath = $$installPath
-qml_files.files = $$QML_FILES
-
-artwork_files.installPath = $$installPath/artwork
-artwork_files.files = $$ARTWORK_FILES
-
-UBUNTU_QML_MODULE_FILES += qmldir_file qml_files artwork_files
+TEMPLATE = subdirs
+
+SUBDIRS += 1.2 \
+           1.3 \
+           AmbianceModule.pro

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro'
--- modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,20 @@
+TEMPLATE = aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.Ambiance
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+
+QMLDIR_FILE = qmldir
+ARTWORK_FILES += artwork/*.png \
+                 artwork/*.svg \
+                 artwork/*.sci
+
+qmldir_file.installPath = $$installPath
+qmldir_file.files = $$QMLDIR_FILE
+
+artwork_files.installPath = $$installPath/artwork
+artwork_files.files = $$ARTWORK_FILES
+
+UBUNTU_QML_MODULE_FILES += qmldir_file artwork_files
+

=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro'
--- modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,14 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.SuruDark
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro'
--- modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,14 @@
+TEMPLATE=aux
+
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.SuruDark
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
+
+QML_FILES = *.qml
+
+qml_files.installPath = $$installPath
+qml_files.files = $$QML_FILES
+
+UBUNTU_QML_MODULE_FILES += qml_files
+

=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
--- modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-04-24 14:48:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-05-02 11:10:54 +0000
@@ -1,27 +1,30 @@
-TEMPLATE = aux
-CONFIG+=ubuntu_qml_module
-
-uri = Ubuntu.Components.Themes.SuruDark
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-
-PARENT_THEME_FILE = parent_theme
-QMLDIR_FILE = qmldir
-QML_FILES = ./1.2/*.qml ./1.3/*.qml
-ARTWORK_FILES += artwork/*.png \
-                 artwork/*.svg \
-                 artwork/*.sci
-
-parent_theme_file.installPath = $$installPath
-parent_theme_file.files = $$PARENT_THEME_FILE
-
-qmldir_file.installPath = $$installPath
-qmldir_file.files = $$QMLDIR_FILE
-
-qml_files.installPath = $$installPath
-qml_files.files = $$QML_FILES
-
-artwork_files.installPath = $$installPath/artwork
-artwork_files.files = $$ARTWORK_FILES
-
-
-UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
+TEMPLATE = subdirs
+
+SUBDIRS += 1.2 \
+           1.3 \
+           SuruDarkModule.pro
+
+#uri = Ubuntu.Components.Themes.SuruDark
+#installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+
+#PARENT_THEME_FILE = parent_theme
+#QMLDIR_FILE = qmldir
+#QML_FILES = ./1.2/*.qml ./1.3/*.qml
+#ARTWORK_FILES += artwork/*.png \
+#                 artwork/*.svg \
+#                 artwork/*.sci
+
+#parent_theme_file.installPath = $$installPath
+#parent_theme_file.files = $$PARENT_THEME_FILE
+
+#qmldir_file.installPath = $$installPath
+#qmldir_file.files = $$QMLDIR_FILE
+
+#qml_files.installPath = $$installPath
+#qml_files.files = $$QML_FILES
+
+#artwork_files.installPath = $$installPath/artwork
+#artwork_files.files = $$ARTWORK_FILES
+
+
+#UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files

=== added file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro'
--- modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro	2015-05-02 11:10:54 +0000
@@ -0,0 +1,22 @@
+TEMPLATE = aux
+CONFIG+=ubuntu_qml_module
+
+uri = Ubuntu.Components.Themes.SuruDark
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+
+PARENT_THEME_FILE = parent_theme
+QMLDIR_FILE = qmldir
+ARTWORK_FILES += artwork/*.png \
+                 artwork/*.svg \
+                 artwork/*.sci
+
+parent_theme_file.installPath = $$installPath
+parent_theme_file.files = $$PARENT_THEME_FILE
+
+qmldir_file.installPath = $$installPath
+qmldir_file.files = $$QMLDIR_FILE
+
+artwork_files.installPath = $$installPath/artwork
+artwork_files.files = $$ARTWORK_FILES
+
+UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file artwork_files

=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro'
--- modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2014-11-26 08:35:25 +0000
+++ modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2015-05-02 11:10:54 +0000
@@ -5,6 +5,7 @@
 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
 
 PARENT_THEME_FILE = parent_theme
+DEPRECATED_FILE = deprecated
 QMLDIR_FILE = qmldir
 QML_FILES = *.qml
 ARTWORK_FILES += artwork/*.png \
@@ -14,6 +15,9 @@
 parent_theme_file.installPath = $$installPath
 parent_theme_file.files = $$PARENT_THEME_FILE
 
+deprecated_file.installPath = $$installPath
+deprecated_file.files = $$DEPRECATED_FILE
+
 qmldir_file.installPath = $$installPath
 qmldir_file.files = $$QMLDIR_FILE
 
@@ -24,4 +28,4 @@
 artwork_files.files = $$ARTWORK_FILES
 
 
-UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
+UBUNTU_QML_MODULE_FILES += parent_theme_file deprecated_file qmldir_file qml_files artwork_files

=== added file 'modules/Ubuntu/Components/Themes/SuruGradient/deprecated'
=== modified file 'modules/Ubuntu/Components/Themes/Themes.pro'
--- modules/Ubuntu/Components/Themes/Themes.pro	2014-11-24 10:39:15 +0000
+++ modules/Ubuntu/Components/Themes/Themes.pro	2015-05-02 11:10:54 +0000
@@ -1,5 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS += ThemesModule.pro \
+           1.2 \
+           1.3 \
            Ambiance \
            SuruDark \
+           #deprecated, but we keep for compatibility
            SuruGradient

=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2015-05-02 11:10:54 +0000
@@ -29,7 +29,7 @@
         Example of different ways to define the toolbar button:
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             width: units.gu(50)

=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2015-05-02 11:10:54 +0000
@@ -39,7 +39,7 @@
     be visible to the user:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             width: units.gu(50)
@@ -71,7 +71,7 @@
     the full height of the toolbar, and other Items you will probably want to center vertically:
     \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
 
         MainView {
             width: units.gu(50)
@@ -120,7 +120,7 @@
       visible in the toolbar, instead of the default toolbar-styled back button:
         \qml
             import QtQuick 2.4
-            import Ubuntu.Components 1.2
+            import Ubuntu.Components 1.3
 
             MainView {
                 width: units.gu(50)

=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
--- modules/Ubuntu/Components/UbuntuListView.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/UbuntuListView.qml	2015-05-02 11:10:54 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype UbuntuListView
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 1.2
+        import Ubuntu.Components 1.3
         import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {

=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2015-05-02 11:10:54 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype UbuntuNumberAnimation
@@ -29,7 +29,7 @@
 
     \qml
     import QtQuick 2.4
-    import Ubuntu.Components 1.2
+    import Ubuntu.Components 1.3
 
     Rectangle {
         width: 100; height: 100

=== modified file 'modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp'
--- modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp	2015-03-23 16:28:35 +0000
+++ modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp	2015-05-02 11:10:54 +0000
@@ -39,7 +39,7 @@
     m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
 {
     // fundamental features rely on the default theme, so bail out if it's absent
-    if (pathFromThemeName(DEFAULT_THEME).isEmpty()) {
+    if (!pathFromThemeName(DEFAULT_THEME).isValid()) {
         qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
     }
 

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-04-24 15:16:34 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-05-02 11:10:54 +0000
@@ -119,7 +119,7 @@
 QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
 {
     showDeprecatedNote(parent, "Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
-    return UCTheme::defaultTheme().createStyleComponent(styleName, parent);
+    return UCTheme::defaultTheme().createStyleComponent(styleName, parent, BUILD_VERSION(1, 2));
 }
 
 void UCDeprecatedTheme::registerToContext(QQmlContext* context)

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-04-25 05:10:08 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-05-02 11:10:54 +0000
@@ -142,7 +142,8 @@
 const QString THEME_FOLDER_FORMAT("%1/%2/");
 const QString PARENT_THEME_FILE("parent_theme");
 
-QStringList themeSearchPath() {
+QStringList themeSearchPath()
+{
     QString envPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
     QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
     if (pathList.isEmpty()) {
@@ -162,7 +163,6 @@
         pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
     }
     pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
-
     // fix folders
     QStringList result;
     Q_FOREACH(const QString &path, pathList) {
@@ -175,8 +175,10 @@
     return result;
 }
 
-QUrl pathFromThemeName(QString themeName)
+UCTheme::ThemeRecord pathFromThemeName(QString themeName)
 {
+    // the first entry from pathList is the app's current folder
+    UCTheme::ThemeRecord record(themeName, QUrl(), false, false);
     themeName.replace('.', '/');
     QStringList pathList = themeSearchPath();
     Q_FOREACH(const QString &path, pathList) {
@@ -184,20 +186,22 @@
         // QUrl needs a trailing slash to understand it's a directory
         QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
         if (QDir(absoluteThemeFolder).exists()) {
-            return QUrl::fromLocalFile(absoluteThemeFolder);
+            record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
+            record.shared = QFile::exists(absoluteThemeFolder + "qmldir");
+            record.path = QUrl::fromLocalFile(absoluteThemeFolder);
+            break;
         }
     }
-    return QUrl();
+    return record;
 }
 
-QString parentThemeName(const QString& themeName)
+QString parentThemeName(const UCTheme::ThemeRecord& themePath)
 {
     QString parentTheme;
-    QUrl themePath = pathFromThemeName(themeName);
     if (!themePath.isValid()) {
-        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themeName));
+        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themePath.name));
     } else {
-        QFile file(themePath.resolved(PARENT_THEME_FILE).toLocalFile());
+        QFile file(themePath.path.resolved(PARENT_THEME_FILE).toLocalFile());
         if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
             QTextStream in(&file);
             parentTheme = in.readLine();
@@ -400,11 +404,11 @@
 
     QString themeName = name();
     while (!themeName.isEmpty()) {
-        QUrl themePath = pathFromThemeName(themeName);
+        ThemeRecord themePath = pathFromThemeName(themeName);
         if (themePath.isValid()) {
             m_themePaths.append(themePath);
         }
-        themeName = parentThemeName(themeName);
+        themeName = parentThemeName(themePath);
     }
 }
 
@@ -549,24 +553,46 @@
     setPalette(NULL);
 }
 
-QUrl UCTheme::styleUrl(const QString& styleName, quint16 version)
+QUrl UCTheme::styleUrl(const QString& styleName, quint16 version, bool *isFallback)
 {
-    Q_FOREACH (const QUrl& themePath, m_themePaths) {
-        // check versioned style first
+    if (isFallback) {
+        (*isFallback) = false;
+    }
+    Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
         QUrl styleUrl;
+        /*
+         * There are two cases where we have to deal with non-versioned styles: application
+         * themes made for the previous theming and deprecated themes. For shared themes,
+         * we have to check the fallback case.
+         */
+        quint16 styleVersion = version;
+        if (themePath.deprecated) {
+            styleVersion = 0;
+        }
+        if (themePath.shared && (version < BUILD_VERSION(1, 2))) {
+            styleVersion = LATEST_UITK_VERSION;
+        }
+
+        // loop through the versions to see if we have one matching
         // we stop at version 1.2 as we do not have support for earlier themes anymore.
-        for (int minor = MINOR_VERSION(version); minor >= 2; minor--) {
-            QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(version)).arg(minor).arg(styleName);
-            styleUrl = themePath.resolved(versionedName);
+        for (int minor = MINOR_VERSION(styleVersion); minor >= 2; minor--) {
+            QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(styleVersion)).arg(minor).arg(styleName);
+            styleUrl = themePath.path.resolved(versionedName);
             if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
+                // set fallback warning if the theme is shared
+                if (isFallback && themePath.shared && (version != styleVersion)) {
+                    (*isFallback) = true;
+                }
                 return styleUrl;
             }
         }
 
-        // fall back to the old one
-        styleUrl = themePath.resolved(styleName);
-        if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
-            return styleUrl;
+        // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
+        if (!themePath.shared || themePath.deprecated) {
+            styleUrl = themePath.path.resolved(styleName);
+            if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
+                return styleUrl;
+            }
         }
     }
 
@@ -642,8 +668,14 @@
         }
         // make sure we have the paths
         if (engine != NULL) {
-            QUrl url = styleUrl(styleName, version);
+            bool fallback = false;
+            QUrl url = styleUrl(styleName, version, &fallback);
             if (url.isValid()) {
+                if (fallback) {
+                    qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")
+                                       .arg(name()).arg(styleName).arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version))
+                                       .arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION));
+                }
                 component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
                 if (component->isError()) {
                     qmlInfo(parent) << component->errorString();

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
--- modules/Ubuntu/Components/plugin/uctheme.h	2015-04-24 15:16:34 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.h	2015-05-02 11:10:54 +0000
@@ -41,6 +41,24 @@
     Q_PROPERTY(QObject* palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL)
     Q_PROPERTY(quint16 version MEMBER m_version WRITE setVersion NOTIFY versionChanged FINAL)
 public:
+    struct ThemeRecord {
+        ThemeRecord() :
+            shared(false), deprecated(false)
+        {}
+        ThemeRecord(const QString &name, const QUrl &path, bool shared, bool deprecated) :
+            name(name), path(path), shared(shared), deprecated(deprecated)
+        {}
+        bool isValid() const
+        {
+            return path.isValid();
+        }
+
+        QString name;
+        QUrl path;
+        bool shared:1;
+        bool deprecated:1;
+    };
+
     explicit UCTheme(QObject *parent = 0);
     static UCTheme &defaultTheme()
     {
@@ -87,7 +105,7 @@
     void init();
     void updateEnginePaths();
     void updateThemePaths();
-    QUrl styleUrl(const QString& styleName, quint16 version);
+    QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
     void loadPalette(bool notify = true);
 
     class PaletteConfig
@@ -138,7 +156,7 @@
     QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
     QQmlEngine *m_engine;
     PaletteConfig m_config;
-    QList<QUrl> m_themePaths;
+    QList<ThemeRecord> m_themePaths;
     UCDefaultTheme m_defaultTheme;
     quint16 m_version;
     bool m_defaultStyle:1;
@@ -147,6 +165,6 @@
     friend class UCDeprecatedTheme;
 };
 
-QUrl pathFromThemeName(QString themeName);
+UCTheme::ThemeRecord pathFromThemeName(QString themeName);
 
 #endif // UCTHEME_H

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2015-04-10 06:52:20 +0000
+++ modules/Ubuntu/Components/qmldir	2015-05-02 11:10:54 +0000
@@ -94,7 +94,6 @@
 CrossFadeImage 1.1 CrossFadeImage11.qml
 PullToRefresh 1.1 PullToRefresh.qml
 UbuntuListView 1.1 UbuntuListView11.qml
-internal PageBase Page10.qml
 Page 1.1 Page11.qml
 PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
 PageHeadSections 1.1 PageHeadSections.qml

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-05-02 11:10:54 +0000
@@ -87,7 +87,7 @@
     def _get_path_to_gallery_source(self):
         return os.path.join(
             ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
-            'ubuntu-ui-toolkit-gallery')
+            '1.3', 'ubuntu-ui-toolkit-gallery')
 
     def _application_source_exists(self):
         return 'UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE' in os.environ
@@ -98,7 +98,8 @@
             'ubuntu-ui-toolkit-gallery.qml')
 
     def _get_path_to_installed_gallery(self):
-        return '/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery'
+        return '/usr/lib/ubuntu-ui-toolkit/examples/'
+        '1.3/ubuntu-ui-toolkit-gallery'
 
     def _get_desktop_file_path(self):
         desktop_file_path = os.path.join(

=== added file 'tests/unit/tst_components/demo_image.jpg'
Binary files tests/unit/tst_components/demo_image.jpg	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/demo_image.jpg	2015-05-02 11:10:54 +0000 differ
=== added file 'tests/unit/tst_components/map_icon.png'
Binary files tests/unit/tst_components/map_icon.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/map_icon.png	2015-05-02 11:10:54 +0000 differ
=== modified file 'tests/unit/tst_components/tst_CrossFadeImage.qml'
--- tests/unit/tst_components/tst_CrossFadeImage.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_components/tst_CrossFadeImage.qml	2015-05-02 11:10:54 +0000
@@ -41,7 +41,7 @@
             width: 123
             height: 321
         }
-        source: Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg")
+        source: Qt.resolvedUrl("demo_image.jpg")
     }
 
     function loadImage(url) {
@@ -91,8 +91,8 @@
 
     function test_fade(data) {
         crossFadeImage.fadeStyle = data.style;
-        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
-        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
+        loadImage("demo_image.jpg");
+        loadImage("map_icon.png");
         waitForAnimation();
         cleanupTest();
     }
@@ -107,8 +107,8 @@
     function test_fadeDuration(data) {
         crossFadeImage.fadeStyle = data.style;
         fadeDuration = UbuntuAnimation.SleepyDuration;
-        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
-        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
+        loadImage("demo_image.jpg");
+        loadImage("map_icon.png");
         sleep(UbuntuAnimation.SleepyDuration / 2); // < fadeDuration
         compare(running, true, "Animation stopped before 1000 ms");
         waitForAnimation();
@@ -116,7 +116,7 @@
     }
 
     function test_sourceSize() {
-        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
+        loadImage("demo_image.jpg");
         compare(crossFadeImage.sourceSize.width, 640, "Source width incorrectly initialized.");
         compare(crossFadeImage.sourceSize.height, 427, "Source height incorrectly initialized.");
         crossFadeImage.sourceSize.width = 100;

=== added directory 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2'
=== renamed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2/TestStyle.qml'
=== removed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme'
--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme	2013-10-11 05:56:57 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Ubuntu.Components.Themes.Ambiance

=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir'
--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir	2013-10-11 05:56:57 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir	2015-05-02 11:10:54 +0000
@@ -1,2 +1,2 @@
 module TestTheme
-TestStyle 1.0 TestStyle.qml
\ No newline at end of file
+TestStyle 1.0 1.2/TestStyle.qml

=== renamed directory 'tests/unit_x11/tst_subtheming/TestModule' => 'tests/unit_x11/tst_subtheming/CustomModule'
=== added file 'tests/unit_x11/tst_subtheming/DeprecatedTheme.qml'
--- tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	2015-05-02 11:10:54 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    width: units.gu(40)
+    height: units.gu(40)
+    theme.name: "Ubuntu.Components.Themes.SuruGradient"
+    style: theme.createStyleComponent("OptionSelectorStyle.qml", item)
+}

=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	2015-05-02 11:10:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme.name: "themes.CustomTheme"
+    theme.version: Ubuntu.version(1, 0)
+    style: theme.createStyleComponent("TestStyle.qml", item)
+}

=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-05-02 11:10:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme.name: "themes.CustomTheme"
+    theme.version: Ubuntu.toolkitVersion
+    style: theme.createStyleComponent("TestStyle.qml", item)
+}

=== added file 'tests/unit_x11/tst_subtheming/StyledItemFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemFallback.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemFallback.qml	2015-05-02 11:10:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme.name: "TestModule.TestTheme"
+    theme.version: Ubuntu.version(1, 0)
+    style: theme.createStyleComponent("TestStyle.qml", item)
+}

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV12.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-05-02 11:10:54 +0000
@@ -18,7 +18,7 @@
 
 StyledItem {
     id: item
-    theme.name: "CustomTheme"
+    theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.version(1, 2)
     style: theme.createStyleComponent("TestStyle.qml", item)
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV13.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-05-02 11:10:54 +0000
@@ -18,7 +18,7 @@
 
 StyledItem {
     id: item
-    theme.name: "CustomTheme"
+    theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.toolkitVersion
     style: theme.createStyleComponent("TestStyle.qml", item)
 }

=== added directory 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2'
=== renamed file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml'
=== modified file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir'
--- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir	2015-05-02 11:10:54 +0000
@@ -1,5 +1,5 @@
 module TestTheme
-TestStyle 1.0 TestStyle.qml
+TestStyle 1.0 ./1.2/TestStyle.qml
 
 #version 1.3
 TestStyle 1.3 ./1.3/TestStyle.qml

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-05-02 11:10:54 +0000
@@ -146,7 +146,7 @@
         if (styleName == "NotExistingTestStyle.qml") {
             ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
         }
-        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
+        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
         view->setTheme("TestModule.TestTheme");
@@ -165,7 +165,7 @@
         QTest::addColumn<bool>("success");
 
         QTest::newRow("One toolkit theme path")
-                << "../tst_theme_engine" << ""
+                << "./themes" << ""
                 << "TestModule.TestTheme" << "TestStyle.qml"
                 << "" << true;
         QTest::newRow("Two toolkit theme paths")
@@ -173,7 +173,7 @@
                 << "CustomTheme" << "TestStyle.qml"
                 << "" << true;
         QTest::newRow("One XDG path")
-                << "" << "../tst_theme_engine"
+                << "" << "./themes"
                 << "TestModule.TestTheme" << "TestStyle.qml"
                 << "" << true;
         QTest::newRow("Two XDG paths")
@@ -244,10 +244,10 @@
 
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "");
-        qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
+        qputenv("QML2_IMPORT_PATH", "/no/plugins/here");
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
-        view->setTheme("TestModule.TestTheme");
+        view->setTheme("CustomModule.TestTheme");
     }
 
     void test_theme_not_root_theme()
@@ -255,7 +255,7 @@
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
-        view->setTheme("TestModule.TestTheme");
+        view->setTheme("CustomModule.TestTheme");
         UCTheme *theme = view->theme();
         UCTheme *globalTheme = view->globalTheme();
         QVERIFY(theme);
@@ -265,7 +265,7 @@
 
     void test_theme_reset_name()
     {
-        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
+        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
         view->setTheme("TestModule.TestTheme");
@@ -626,29 +626,63 @@
     {
         QTest::addColumn<QString>("document");
         QTest::addColumn<QString>("testValue");
+        QTest::addColumn<int>("row");
+        QTest::addColumn<int>("column");
+        QTest::addColumn<QString>("warning");
 
         QTest::newRow("Theming version 1.2")
                 << "StyledItemV12.qml"
-                << "";
+                << ""
+                << 0 << 0 << "";
         QTest::newRow("Theming version 1.3")
                 << "StyledItemV13.qml"
-                << "version1.3";
+                << "version1.3"
+                << 0 << 0 << "";
+        QTest::newRow("Fall back to 1.3")
+                << "StyledItemFallback.qml"
+                << "version1.3"
+                << 19 << 1 << "QML StyledItem: Theme 'TestModule.TestTheme' has no 'TestStyle.qml' style for version 1.0, fall back to version 1.3.";
+        QTest::newRow("App theme versioned")
+                << "StyledItemAppThemeVersioned.qml"
+                << "version1.3"
+                << 0 << 0 << "";
+        QTest::newRow("App theme fallback to non-versioned")
+                << "StyledItemAppThemeFallback.qml"
+                << ""
+                << 0 << 0 << "";
     }
     void test_theme_versions()
     {
         QFETCH(QString, document);
         QFETCH(QString, testValue);
+        QFETCH(int, row);
+        QFETCH(int, column);
+        QFETCH(QString, warning);
 
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
+        if (!warning.isEmpty()) {
+            ThemeTestCase::ignoreWarning(document, row, column, warning, 2);
+        }
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
         UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
+        QVERIFY(UCStyledItemBasePrivate::get(styledItem)->styleItem);
         QString newProperty(UCStyledItemBasePrivate::get(styledItem)->styleItem->property("newProperty").toString());
         QCOMPARE(newProperty, testValue);
         // NOTE TestTheme resets the theme therefore the theming will look for the tested style under Ambiance theme
         // which will cause a warning; therefore we mark the warning to be ignored
         ThemeTestCase::ignoreWarning(document, 19, 1, "QML StyledItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
     }
+
+    void test_deprecated_theme()
+    {
+        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
+        qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule:" + m_themesPath.toLatin1());
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
+        // NOTE TestTheme resets the theme therefore the theming will look for the tested style version under Ambiance theme
+        // which will cause a warning; therefore we mark the warning to be ignored
+        ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Theme 'Ubuntu.Components.Themes.Ambiance' has no 'OptionSelectorStyle.qml' style for version 1.0, fall back to version 1.3.");
+    }
 };
 
 QTEST_MAIN(tst_Subtheming)

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-05-02 11:10:54 +0000
@@ -8,7 +8,8 @@
     themes/CustomTheme/TestStyle.qml \
     themes/CustomTheme/Palette.qml \
     themes/CustomTheme/parent_theme \
-    themes/TestModule/TestTheme/TestStyle.qml \
+    themes/TestModule/TestTheme/1.2/TestStyle.qml \
+    themes/TestModule/TestTheme/1.3/TestStyle.qml \
     themes/TestModule/TestTheme/qmldir \
     themes/TestModule/TestTheme/parent_theme \
     DynamicAssignment.qml \
@@ -26,6 +27,10 @@
     themes/TestModule/TestTheme/1.3/TestStyle.qml \
     themes/CustomTheme/1.3/TestStyle.qml \
     StyledItemV12.qml \
-    StyledItemV13.qml
+    StyledItemV13.qml \
+    StyledItemFallback.qml \
+    StyledItemAppThemeFallback.qml \
+    DeprecatedTheme.qml \
+    StyledItemAppThemeVersioned.qml