Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA10 landing 2016-03-10

OTA10 landing 2016-03-10

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1889
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2287/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/111/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10]

1890. By Zoltan Balogh on 2016-03-15

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1890
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/117/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10]

1891. By Zoltan Balogh on 2016-03-15

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1891
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/118/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10]

1892. By Zoltan Balogh on 2016-03-16

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1892
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/119/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10]

1893. By Zoltan Balogh on 2016-03-23

Sync with staging

1894. By Zoltan Balogh on 2016-03-24

No gdb when running unit tests on armv7l

1895. By Zoltan Balogh on 2016-03-24

Fix the arm check in the runtest.sh

1896. By Zoltan Balogh on 2016-04-04

Update from staging

=== modified file 'README'
--- README	2015-01-14 15:18:05 +0000
+++ README	2016-04-04 04:42:19 +0000
@@ -39,7 +39,7 @@
 
 To use these components in QML without installing them, you need to set the 
 QML2_IMPORT_PATH environment variable. This is done by running
-$ source export_modules_dir.sh
+$ source export_qml_dir.sh
 from the root directory of this repository, but is lost when you close your 
 shell.
 

=== modified file 'apicheck/apicheck.cpp'
--- apicheck/apicheck.cpp	2015-12-18 15:26:04 +0000
+++ apicheck/apicheck.cpp	2016-04-04 04:42:19 +0000
@@ -39,6 +39,10 @@
 #include <QJsonArray>
 #include <QLoggingCategory>
 
+#define foreach Q_FOREACH
+#include <QtQml/private/qqmlengine_p.h>
+#undef foreach
+
 #include <iostream>
 #include <algorithm>
 
@@ -50,6 +54,7 @@
 
 QString currentProperty;
 QString inObjectInstantiation;
+QQmlEngine *currentEngine=0;
 
 void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject *> *metas, bool extended = false)
 {
@@ -91,8 +96,14 @@
 void collectReachableMetaObjects(const QQmlType *ty, QSet<const QMetaObject *> *metas)
 {
     collectReachableMetaObjects(ty->metaObject(), metas, ty->isExtendedType());
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    if (ty->attachedPropertiesType(QQmlEnginePrivate::get(currentEngine)))
+        collectReachableMetaObjects(ty->attachedPropertiesType(QQmlEnginePrivate::get(currentEngine)), metas);
+#else
     if (ty->attachedPropertiesType())
         collectReachableMetaObjects(ty->attachedPropertiesType(), metas);
+#endif
 }
 
 /* We want to add the MetaObject for 'Qt' to the list, this is a
@@ -536,7 +547,11 @@
             if (isSingleton)
                 object.insert("isSingleton", true);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType(QQmlEnginePrivate::get(currentEngine))) {
+#else
             if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) {
+#endif
                 // Can happen when a type is registered that returns itself as attachedPropertiesType()
                 // because there is no creatable type to attach to.
                 if (attachedType != meta) {
@@ -794,6 +809,7 @@
     qmlRegisterSingletonType<QObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
 
     QQmlEngine engine;
+    currentEngine = &engine;
     QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
 
     // load the QtQuick 2 plugin

=== modified file 'components.api'
--- components.api	2016-02-24 13:18:49 +0000
+++ components.api	2016-04-04 04:42:19 +0000
@@ -197,6 +197,7 @@
     signal collapseCompleted()
     function commit()
     function collapse()
+    property bool preloadContent
     property list<BottomEdgeRegion> regions
     readonly property Status status
 Ubuntu.Components.BottomEdge.DragDirection: Enum
@@ -223,6 +224,8 @@
     property url contentUrl
     property bool enabled
     property double from
+    signal contentChanged(url url)
+    signal contentComponentChanged(Component component)
     signal entered()
     signal exited()
     signal dragEnded()
@@ -422,7 +425,10 @@
     default property list<QtObject> contents
     property double edgeMargins
     property bool modal
+    property Component style
+    property string styleName
     property string text
+    property ThemeSettings theme
     property string title
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
@@ -984,6 +990,9 @@
     function var show()
     function var hide()
     property Item pointerTarget
+    property Component style
+    property string styleName
+    property ThemeSettings theme
 Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
     property Item dismissArea
     property PropertyAnimation fadingAnimation
@@ -1047,6 +1056,8 @@
 Ubuntu.Components.ScrollView 1.3: StyledItem
     default property Item contentItem
     readonly property Flickable flickableItem
+    property Scrollbar horizontalScrollbar
+    property Scrollbar verticalScrollbar
     readonly property Item viewport
 Ubuntu.Components.Scrollbar 1.0 0.1: StyledItem
     property int align
@@ -1174,6 +1185,7 @@
     property Direction direction
     readonly property double distance
     readonly property bool dragging
+    property bool grabGesture
     property bool immediateRecognition
     signal directionChanged(Direction direction)
     signal draggingChanged(bool dragging)
@@ -1181,6 +1193,7 @@
     signal distanceChanged(double distance)
     signal touchPositionChanged(QPointF position)
     signal immediateRecognitionChanged(bool immediateRecognition)
+    signal grabGestureChanged(bool grabGesture)
     readonly property bool pressed
     readonly property QPointF touchPosition
 Ubuntu.Components.SwipeArea.Direction: Enum
@@ -1713,6 +1726,19 @@
     function var warningFormat(var line, var column, var message)
     function var waitForHeaderAnimation(var mainView)
     readonly property QuickTestUtil testUtil
+Ubuntu.Test.UbuntuTestCase 1.3 UbuntuTestCase13: TestCase
+    function var findChild(var obj, var objectName)
+    function var findInvisibleChild(var obj, var objectName)
+    function var findChildWithProperty(var item, var property, var value)
+    function var centerOf(var item)
+    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
+    function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
+    function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
+    function var tryCompareFunction(var func, var expectedResult, var timeout)
+    function var typeString(var string)
+    function var warningFormat(var line, var column, var message)
+    function var waitForHeaderAnimation(var mainView)
+    readonly property QuickTestUtil testUtil
 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
     signal opened(QStringList uris)
 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-30 23:08:38 +0000
+++ debian/changelog	2016-04-04 04:42:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit (1.3.1872+16.04.20160330.2-0ubuntu1) xenial; urgency=medium
 
   [ Tim Peeters ]
@@ -7,6 +8,102 @@
 
  -- Zoltan Balogh <[e-mail]>  Wed, 30 Mar 2016 23:08:38 +0000
 
+=======
+ubuntu-ui-toolkit (1.3.1918+16.04-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Benjamin Zeller ] 
+  * Register expected warning messages in the tree testcase.
+  * Add testsuite for Tree. Fixes LP: #1549171.
+  * Compile with Qt 5.6. Fixes LP: #1540356
+  * More Qt 5.6 fixes.
+  
+  [ Michael Terry ]
+  * Add grabGesture field to SwipeArea.
+  * This field controls whether the SwipeArea takes ownership of the gestures it
+    observes. Fixes LP: #1527387.
+
+  [ Timo Jyrinki ]
+  * Add a test for blocking if packaging not sorted and clean.
+  * More package name transitioning, wrap and sort, fix debian/copyright syntax, 
+    update standards-version, fix devel package sections and add/fix 
+    lintian-overrides.
+
+  [ Olivier Tilloy ]
+  * Fix dependencies of the transitional dummy package 
+    qtdeclarative5-ubuntu-ui-toolkit-plugin. Fixes LP: #1553551.
+
+  [ Christian Dywan ]
+  * Rename qtdeclarative5-*-plugin to qml-module-*. Fixes LP: #1342031.
+  * Require a qtdeclarative5 known to have the tab fence patch.
+  * Reset previous theme version and use UbuntuTestCase in tst_animator.
+  * BottomEdge(Hint) focus and close via keyboard. Fixes LP: #1523825
+  * Add 1.3 version of UbuntuTestCase.
+  * No gdb when running unit tests on armv7l.
+  * Build-depend on python3-debian for wrap-and-sort.
+
+  [ XiaoGuo Liu ]
+  * Fix AdaptivePageLayout documentation.
+
+  [ Tim Peeters ]
+  * Properly disable left/right arrows on sections when at the beginning/end of
+    the list. Fixes LP: #1551356.
+  * Sections and old AppHeader landscape mode. Fixes LP: #1551341.
+  * Set the window color as soon as the window is available, to avoid a 
+    flickering background when it is updated later. 
+    Fixes LP: #1439133, LP: #1554897
+  * Add theme, style and styleName properties to Dialog and Popover. 
+    Fixes LP: #1555548
+  * Update the gallery script to use the new name of the export script.
+  * Export the full list of library paths.
+  * Prevent Page geometry changes in APL when changing Pages in a column.
+  * Fix typo in DatePickerStyle. Fixes:  LP #1561440.
+
+  [ Zsombor Egri ]
+  * ListItem focus navigation in ListView and other views. 
+    Fixes LP: #1523815, LP: #1536679, LP: #1549733, LP: #1549743
+  * BorromEdge.preloadContent. Fixes LP: #1540454.
+  * Asynchronous loader (AsyncLoader) using incubator, prerequisite for 
+    BottomEdge preloading its content. Fixes LP: #1540454.
+  * ListView proxy should not consume up/down key events. Fixes LP: #1554447
+  * Pick up the right style. Fixes LP: #1555797
+  * Label makes sure the color alteration is known by the theming. 
+    Fixes LP: #1555784
+  * Fix AsyncLoader tests so they create slightly less amount of elements.
+  * AdaptivePageLayout removes all pages pushed to next columns when 
+    addPageToNextColumn() is called. Fixes LP: #1544745
+  * Fix BottomEdge content discarding.
+  * Disconnect enabled signal in Label in destructor, so functor call will not 
+    be handled when QQuickItem triggers enabled change. Fixes LP: #1560044.
+
+
+  [ Andrea Bernabei ]
+  * UI Gallery: fix vertical alignment of labels in left panel list items.
+  * ScrollView: add horizontalScrollbar and verticalScrollbar properties to 
+    allow custom properties and styling of scrollbars.
+  * Change Scrollbar default top and bottom anchor margins. Tests included.
+
+  [ Albert Astals Cid ] 
+  * Use "/" instead of QDir::separator for building paths that will be passed
+    to Qt.
+  * Some string optimizations in the icon searching code
+  * Improve icon file searching. Leave searching in hicolor to the end. Do not
+    search on icon themes we've already searched.
+
+  [ Zoltán Balogh ]
+  * Clean up examples. 
+  * Improve unit test plan tool
+
+  [ Florian Boucault ]
+  * Properly disable PerformanceMonitor for toolkit tests only. Re-enable it for
+    everything else.
+
+  [ Pierre Bertet ]
+  * Fix the lists style in the offline documentation. Fixes LP: #1557472.
+  * Make export_qml_dir.sh compatible with ZSH.
+
+ -- Zoltán Balogh <[e-mail]>  Thu, 10 Mar 2016 07:40:40 +0200
+
+>>>>>>> MERGE-SOURCE
 ubuntu-ui-toolkit (1.3.1872+16.04.20160314-0ubuntu1) xenial; urgency=medium
 
   [ Zoltán Balogh ]

=== modified file 'debian/control'
--- debian/control	2016-02-11 16:17:46 +0000
+++ debian/control	2016-04-04 04:42:19 +0000
@@ -2,97 +2,153 @@
 Priority: optional
 Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
+Build-Depends: accountsservice,
+               dbus,
+               dbus-test-runner,
+               debhelper (>= 9.0.0),
                devscripts,
+               gdb,
+               language-pack-en-base,
+               libdbus-1-dev,
+               libfontconfig1-dev,
+               libfreetype6-dev,
+               libgl1-mesa-dri,
                libgles2-mesa-dev,
                libglib2.0-dev,
-               python3:any,
-               qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
                libinput-dev,
+               liblttng-ust-dev,
+               libmtdev-dev,
+               libnih-dbus-dev,
+               libqt5sql5-sqlite,
+               libqt5svg5-dev,
+               libudev-dev,
                libxkbcommon-dev,
+               libxrender-dev,
+               locales,
+               python3-debian,
+               python3-sphinx,
+               python3:any,
+               qml-module-qt-labs-settings,
+               qml-module-qtfeedback,
+               qml-module-qtgraphicaleffects,
+               qml-module-qtqml-models2,
+               qml-module-qtquick-layouts,
+               qml-module-qtquick-localstorage,
+               qml-module-qtquick-window2,
+               qml-module-qtquick2,
+               qml-module-qttest,
                qtbase5-dev,
                qtbase5-private-dev,
-               qttools5-dev-tools,
-               libqt5sql5-sqlite,
+               qtdeclarative5-dev (>= 5.4.1-1ubuntu11~overlay3),
                qtdeclarative5-dev-tools,
+               qtdeclarative5-doc-html,
                qtdeclarative5-private-dev,
-               qml-module-qtquick2,
-               qml-module-qttest,
-               qml-module-qtquick-window2,
-               qml-module-qtquick-layouts,
-               qml-module-qtfeedback,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
-               qtdeclarative5-private-dev,
-               qml-module-qtquick-localstorage,
-               qml-module-qt-labs-settings,
-               qml-module-qtqml-models2,
-               qtdeclarative5-doc-html,
-               qtwebkit5-doc-html,
-               qtsvg5-doc-html,
-               libqt5svg5-dev,
-               qtscript5-doc-html,
                qtmultimedia5-doc-html,
-               unity-action-doc,
-               devscripts,
                qtpim5-dev,
-               language-pack-en-base,
-               libdbus-1-dev,
-               libnih-dbus-dev,
-               dbus,
-               dbus-test-runner,
-               accountsservice,
-               xvfb,
-               gdb,
-               libgl1-mesa-dri,
-               locales,
+               qtscript5-doc-html,
+               qtsvg5-doc-html,
+               qttools5-dev-tools,
+               qtwebkit5-doc-html,
                suru-icon-theme,
+               unity-action-doc,
                uuid-runtime,
-               python3-sphinx,
-               libfontconfig1-dev,
-               libfreetype6-dev,
-               libmtdev-dev,
-               libudev-dev,
-               libxrender-dev,
-               liblttng-ust-dev
-Standards-Version: 3.9.4
+               xvfb,
+Standards-Version: 3.9.7
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
-# If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
-# changes, just go ahead. ~ubuntu-sdk-team will notice and sync up the code
-# again.
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
 
-Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
+Package: qml-module-ubuntu-components
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
-         libqt5svg5,
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5svg5,
+         libubuntugestures5 (= ${binary:Version}),
+         libubuntutoolkit5 (= ${binary:Version}),
+         qml-module-qtfeedback,
+         qml-module-qtgraphicaleffects,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick-window2,
          qml-module-qtquick2,
-         qml-module-qtquick-window2,
-         qml-module-qtquick-layouts,
-         qml-module-qtfeedback,
+         qml-module-ubuntu-performancemetrics,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
-         libubuntugestures5 (= ${binary:Version}),
-         libubuntutoolkit5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Conflicts: qt-components-ubuntu
-Replaces: qt-components-ubuntu
-Provides: qt-components-ubuntu
-Description: Qt Components for Ubuntu - QML plugin
- Qt Components for Ubuntu offers a set of reusable user interface
- components for Qt Quick 2 / QML.
- .
- This package contains the Ubuntu Components QML plugin.
-
+         ${misc:Depends},
+         ${shlibs:Depends},
+Conflicts: qt-components-ubuntu,
+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Replaces: qt-components-ubuntu,
+          qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Provides: qt-components-ubuntu,
+Description: Qt Components for Ubuntu - Components QML plugin
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Components QML plugin.
+
+Package: qml-module-ubuntu-layouts
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Description: Qt Components for Ubuntu - Layouts QML plugin
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Layouts QML plugin.
+
+Package: qml-module-ubuntu-test
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: qml-module-qttest | qtdeclarative5-test-plugin,
+         qml-module-ubuntu-components,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Description: Qt Components for Ubuntu - Test QML plugin
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Test QML plugin.
+
+Package: qml-module-ubuntu-performancemetrics
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu PerformanceMetrics QML plugin.
+
+Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
+Architecture: any
+Section: oldlibs
+Depends: qml-module-ubuntu-components,
+         qml-module-ubuntu-layouts,
+         qml-module-ubuntu-performancemetrics,
+         qml-module-ubuntu-test,
+         ${misc:Depends},
+Description: Transitional dummy package for Ubuntu UI Toolkit QML plugin
+ This package contains the Ubuntu Components QML plugin.
 
 Package: libubuntugestures5
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu gestures library for Ubuntu UI Toolkit
@@ -102,7 +158,9 @@
 Package: libubuntugestures5-dev
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu gestures library development files
@@ -112,7 +170,9 @@
 Package: libubuntugestures5-private-dev
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu gestures library private development files
@@ -122,7 +182,8 @@
 Package: libubuntutoolkit5
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
@@ -132,20 +193,35 @@
 Package: libubuntutoolkit5-dev
 Architecture: any
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu toolkit common library development files
  This package contains the development files for
  Ubuntu toolkit common library
 
+Package: libubuntutoolkit5-private-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu toolkit common library private development files
+ This package contains the private development files for
+ Ubuntu toolkit common library
+
 Package: ubuntu-ui-toolkit-theme
 Architecture: any
 Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Replaces: qt-components-ubuntu
+Replaces: qt-components-ubuntu,
 Description: Qt Components for Ubuntu - Ubuntu Theme
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.
@@ -156,18 +232,19 @@
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Suggests: qtdeclarative5-doc-html,
+          qtmultimedia5-doc-html,
+          qtscript5-doc-html,
+          qtsvg5-doc-html,
           qtwebkit5-doc-html,
-          qtsvg5-doc-html,
-          qtscript5-doc-html,
-          qtmultimedia5-doc-html,
           unity-action-doc,
-Conflicts: qt-components-ubuntu-doc
-Replaces: qt-components-ubuntu-doc
-Provides: qt-components-ubuntu-doc
+Conflicts: qt-components-ubuntu-doc,
+Replaces: qt-components-ubuntu-doc,
+Provides: qt-components-ubuntu-doc,
 Description: Qt Components for Ubuntu - documentation
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.
@@ -177,17 +254,21 @@
 Package: ubuntu-ui-toolkit-examples
 Section: devel
 Architecture: any
-Depends: ubuntu-ui-toolkit-tools (>= ${source:Version}),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (= ${binary:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
-         ubuntu-ui-toolkit-theme (= ${binary:Version}),
+Depends: qml-module-qt-labs-folderlistmodel,
          qml-module-qtquick-xmllistmodel,
-         qml-module-qt-labs-folderlistmodel,
+         qml-module-ubuntu-components (= ${binary:Version}) | qml-module-ubuntu-components-gles,
+         ubuntu-ui-toolkit-theme (= ${binary:Version}),
+         ubuntu-ui-toolkit-tools (>= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: libqt5multimedia5-plugins, ubuntu-ui-toolkit-doc
-Conflicts: qt-components-ubuntu-examples, qt-components-ubuntu-demos
-Replaces: qt-components-ubuntu-examples, qt-components-ubuntu-demos
-Provides: qt-components-ubuntu-examples, qt-components-ubuntu-demos
+         ${shlibs:Depends},
+Recommends: libqt5multimedia5-plugins,
+            ubuntu-ui-toolkit-doc,
+Conflicts: qt-components-ubuntu-demos,
+           qt-components-ubuntu-examples,
+Replaces: qt-components-ubuntu-demos,
+          qt-components-ubuntu-examples,
+Provides: qt-components-ubuntu-demos,
+          qt-components-ubuntu-examples,
 Description: Qt Components for Ubuntu - demos and examples
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.
@@ -196,35 +277,35 @@
 
 Package: ubuntu-ui-toolkit-autopilot
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         autopilot-qt5,
+Depends: autopilot-qt5,
          dpkg-dev,
          libqt5test5,
          libqt5widgets5,
+         python3-autopilot (>= 1.4),
+         python3-autopilot-trace,
          python3-fixtures,
          python3-gi,
          python3-testscenarios,
          python3-testtools,
-         python3-autopilot (>= 1.4),
-         python3-autopilot-trace,
+         qml-module-qttest,
+         qml-module-ubuntu-components (>= ${source:Version}) | qml-module-ubuntu-components-gles,
          qttestability-autopilot,
+         ubuntu-app-launch-profiler (>= ${source:Version}),
          ubuntu-keyboard-autopilot [amd64 armhf i386],
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
          upstart,
          url-dispatcher-tools,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
-         ubuntu-app-launch-profiler (>= ${source:Version}),
-         qml-module-qttest | qtdeclarative5-test-plugin,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package
 
 Package: ubuntu-app-launch-profiler
 Architecture: any
-Depends: ${misc:Depends},
+Depends: lttng-tools,
+         python3-babeltrace,
+         ${misc:Depends},
          ${shlibs:Depends},
-         lttng-tools,
-         python3-babeltrace
 Description: Qt Components for Ubuntu - startup time profiling tool
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.
@@ -234,7 +315,7 @@
 Package: ubuntu-ui-toolkit-tools
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Description: Qt Components for Ubuntu - productive tools
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.

=== modified file 'debian/copyright'
--- debian/copyright	2015-04-08 10:46:56 +0000
+++ debian/copyright	2016-04-04 04:42:19 +0000
@@ -2,13 +2,13 @@
 Upstream-Name: ubuntu-ui-toolkit
 Source: https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
 
-Files: * 
+Files: *
 Copyright: 2012-2013 Canonical Ltd.
 License: LGPL-3.0
 
 Files: modules/Ubuntu/Components/Themes/Ambiance/artwork/*
-Files: modules/Ubuntu/Components/artwork/*
-Files: modules/Ubuntu/Components/ListItems/artwork/*
+       modules/Ubuntu/Components/artwork/*
+       modules/Ubuntu/Components/ListItems/artwork/*
 Copyright: 2004-2013, Canonical Ltd.
 License: CC-BY-SA-3.0
  Unless otherwise indicated, artwork is available under the Creative
@@ -17,273 +17,273 @@
  http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
  Creative Commons, 171 Second Street, Suite 300, San Francisco,
  California, 94105, USA. See below for the full text of the license.
- . 
- Some Rights Reserved: 
- . 
+ .
+ Some Rights Reserved:
+ .
  The rights in the trademarks, logos, service marks of Canonical Ltd,
  as well as the look and feel of Ubuntu, are not licensed under the
  Creative Commons license and are subject to the Canonical Trademark
  Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy
- . 
- License: 
- . 
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE 
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN 
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS 
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES 
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR 
+ .
+ License:
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
  DAMAGES RESULTING FROM ITS USE.
- . 
+ .
  License
- . 
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS 
- CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS 
- PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE 
- WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW 
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW
  IS PROHIBITED.
- . 
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND 
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
  AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU
- THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH 
+ THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
  TERMS AND CONDITIONS.
- . 
+ .
  1. Definitions
- . 
-    1. "Collective Work" means a work, such as a periodical issue, 
-    anthology or encyclopedia, in which the Work in its entirety in 
-    unmodified form, along with a number of other contributions, 
-    constituting separate and independent works in themselves, are 
-    assembled into a collective whole. A work that constitutes a 
-    Collective Work will not be considered a Derivative Work 
+ .
+    1. "Collective Work" means a work, such as a periodical issue,
+    anthology or encyclopedia, in which the Work in its entirety in
+    unmodified form, along with a number of other contributions,
+    constituting separate and independent works in themselves, are
+    assembled into a collective whole. A work that constitutes a
+    Collective Work will not be considered a Derivative Work
     (as defined below) for the purposes of this License.
-    2. "Derivative Work" means a work based upon the Work or upon the 
-    Work and other pre-existing works, such as a translation, musical 
-    arrangement, dramatization, fictionalization, motion picture 
-    version, sound recording, art reproduction, abridgment, 
-    condensation, or any other form in which the Work may be recast, 
-    transformed, or adapted, except that a work that constitutes a 
-    Collective Work will not be considered a Derivative Work for the 
-    purpose of this License. For the avoidance of doubt, where the Work 
-    is a musical composition or sound recording, the synchronization of 
-    the Work in timed-relation with a moving image ("synching") will be 
+    2. "Derivative Work" means a work based upon the Work or upon the
+    Work and other pre-existing works, such as a translation, musical
+    arrangement, dramatization, fictionalization, motion picture
+    version, sound recording, art reproduction, abridgment,
+    condensation, or any other form in which the Work may be recast,
+    transformed, or adapted, except that a work that constitutes a
+    Collective Work will not be considered a Derivative Work for the
+    purpose of this License. For the avoidance of doubt, where the Work
+    is a musical composition or sound recording, the synchronization of
+    the Work in timed-relation with a moving image ("synching") will be
     considered a Derivative Work for the purpose of this License.
-    3. "Licensor" means the individual or entity that offers the Work 
+    3. "Licensor" means the individual or entity that offers the Work
     under the terms of this License.
-    4. "Original Author" means the individual or entity who created the 
+    4. "Original Author" means the individual or entity who created the
     Work.
-    5. "Work" means the copyrightable work of authorship offered under 
+    5. "Work" means the copyrightable work of authorship offered under
     the terms of this License.
-    6. "You" means an individual or entity exercising rights under this 
-    License who has not previously violated the terms of this License 
-    with respect to the Work, or who has received express permission 
-    from the Licensor to exercise rights under this License despite a 
+    6. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License
+    with respect to the Work, or who has received express permission
+    from the Licensor to exercise rights under this License despite a
     previous violation.
-    7. "License Elements" means the following high-level license 
-    attributes as selected by Licensor and indicated in the title of 
+    7. "License Elements" means the following high-level license
+    attributes as selected by Licensor and indicated in the title of
     this License: Attribution, ShareAlike.
- . 
- 2. Fair Use Rights. Nothing in this license is intended to reduce, 
- limit, or restrict any rights arising from fair use, first sale or 
- other limitations on the exclusive rights of the copyright owner under 
+ .
+ 2. Fair Use Rights. Nothing in this license is intended to reduce,
+ limit, or restrict any rights arising from fair use, first sale or
+ other limitations on the exclusive rights of the copyright owner under
  copyright law or other applicable laws.
- . 
- 3. License Grant. Subject to the terms and conditions of this License, 
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive, 
- perpetual (for the duration of the applicable copyright) license to 
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
  exercise the rights in the Work as stated below:
- . 
-    1. to reproduce the Work, to incorporate the Work into one or more 
-    Collective Works, and to reproduce the Work as incorporated in the 
+ .
+    1. to reproduce the Work, to incorporate the Work into one or more
+    Collective Works, and to reproduce the Work as incorporated in the
     Collective Works;
     2. to create and reproduce Derivative Works;
-    3. to distribute copies or phonorecords of, display publicly, 
-    perform publicly, and perform publicly by means of a digital audio 
+    3. to distribute copies or phonorecords of, display publicly,
+    perform publicly, and perform publicly by means of a digital audio
     transmission the Work including as incorporated in Collective Works;
-    4. to distribute copies or phonorecords of, display publicly, 
-    perform publicly, and perform publicly by means of a digital audio 
+    4. to distribute copies or phonorecords of, display publicly,
+    perform publicly, and perform publicly by means of a digital audio
     transmission Derivative Works.
     5.
- . 
-       For the avoidance of doubt, where the work is a musical 
+ .
+       For the avoidance of doubt, where the work is a musical
        composition:
-          1. Performance Royalties Under Blanket Licenses. Licensor 
-          waives the exclusive right to collect, whether individually 
-          or via a performance rights society (e.g. ASCAP, BMI, SESAC), 
-          royalties for the public performance or public digital 
+          1. Performance Royalties Under Blanket Licenses. Licensor
+          waives the exclusive right to collect, whether individually
+          or via a performance rights society (e.g. ASCAP, BMI, SESAC),
+          royalties for the public performance or public digital
           performance (e.g. webcast) of the Work.
-          2. Mechanical Rights and Statutory Royalties. Licensor waives 
-          the exclusive right to collect, whether individually or via a 
-          music rights society or designated agent (e.g. Harry Fox 
-          Agency), royalties for any phonorecord You create from the 
-          Work ("cover version") and distribute, subject to the 
-          compulsory license created by 17 USC Section 115 of the US 
+          2. Mechanical Rights and Statutory Royalties. Licensor waives
+          the exclusive right to collect, whether individually or via a
+          music rights society or designated agent (e.g. Harry Fox
+          Agency), royalties for any phonorecord You create from the
+          Work ("cover version") and distribute, subject to the
+          compulsory license created by 17 USC Section 115 of the US
           Copyright Act (or the equivalent in other jurisdictions).
-    6. Webcasting Rights and Statutory Royalties. For the avoidance of 
-    doubt, where the Work is a sound recording, Licensor waives the 
-    exclusive right to collect, whether individually or via a 
-    performance-rights society (e.g. SoundExchange), royalties for the 
-    public digital performance (e.g. webcast) of the Work, subject to 
-    the compulsory license created by 17 USC Section 114 of the US 
+    6. Webcasting Rights and Statutory Royalties. For the avoidance of
+    doubt, where the Work is a sound recording, Licensor waives the
+    exclusive right to collect, whether individually or via a
+    performance-rights society (e.g. SoundExchange), royalties for the
+    public digital performance (e.g. webcast) of the Work, subject to
+    the compulsory license created by 17 USC Section 114 of the US
     Copyright Act (or the equivalent in other jurisdictions).
- . 
- The above rights may be exercised in all media and formats whether now 
- known or hereafter devised. The above rights include the right to make 
- such modifications as are technically necessary to exercise the rights 
- in other media and formats. All rights not expressly granted by 
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. All rights not expressly granted by
  Licensor are hereby reserved.
- . 
- 4. Restrictions.The license granted in Section 3 above is expressly 
+ .
+ 4. Restrictions.The license granted in Section 3 above is expressly
  made subject to and limited by the following restrictions:
- . 
-    1. You may distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Work only under the terms of this 
-    License, and You must include a copy of, or the Uniform Resource 
-    Identifier for, this License with every copy or phonorecord of the 
+ .
+    1. You may distribute, publicly display, publicly perform, or
+    publicly digitally perform the Work only under the terms of this
+    License, and You must include a copy of, or the Uniform Resource
+    Identifier for, this License with every copy or phonorecord of the
     Work You distribute, publicly display, publicly perform, or publicly
     digitally perform. You may not offer or impose any terms on the Work
-    that alter or restrict the terms of this License or the recipients' 
+    that alter or restrict the terms of this License or the recipients'
     exercise of the rights granted hereunder. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License 
-    and to the disclaimer of warranties. You may not distribute, 
-    publicly display, publicly perform, or publicly digitally perform 
+    Work. You must keep intact all notices that refer to this License
+    and to the disclaimer of warranties. You may not distribute,
+    publicly display, publicly perform, or publicly digitally perform
     the Work with any technological measures that control access or use
-    of the Work in a manner inconsistent with the terms of this License 
-    Agreement. The above applies to the Work as incorporated in a 
+    of the Work in a manner inconsistent with the terms of this License
+    Agreement. The above applies to the Work as incorporated in a
     Collective Work, but this does not require the Collective Work apart
-    from the Work itself to be made subject to the terms of this 
-    License. If You create a Collective Work, upon notice from any 
-    Licensor You must, to the extent practicable, remove from the 
+    from the Work itself to be made subject to the terms of this
+    License. If You create a Collective Work, upon notice from any
+    Licensor You must, to the extent practicable, remove from the
     Collective Work any credit as required by clause 4(c), as requested.
-    If You create a Derivative Work, upon notice from any Licensor You 
-    must, to the extent practicable, remove from the Derivative Work 
+    If You create a Derivative Work, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Derivative Work
     any credit as required by clause 4(c), as requested.
-    2. You may distribute, publicly display, publicly perform, or 
-    publicly digitally perform a Derivative Work only under the terms 
-    of this License, a later version of this License with the same 
-    License Elements as this License, or a Creative Commons iCommons 
-    license that contains the same License Elements as this License 
+    2. You may distribute, publicly display, publicly perform, or
+    publicly digitally perform a Derivative Work only under the terms
+    of this License, a later version of this License with the same
+    License Elements as this License, or a Creative Commons iCommons
+    license that contains the same License Elements as this License
     (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of,
-    or the Uniform Resource Identifier for, this License or other 
-    license specified in the previous sentence with every copy or 
-    phonorecord of each Derivative Work You distribute, publicly 
-    display, publicly perform, or publicly digitally perform. You may 
-    not offer or impose any terms on the Derivative Works that alter or 
-    restrict the terms of this License or the recipients' exercise of 
-    the rights granted hereunder, and You must keep intact all notices 
-    that refer to this License and to the disclaimer of warranties. 
-    You may not distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Derivative Work with any 
-    technological measures that control access or use of the Work in a 
-    manner inconsistent with the terms of this License Agreement. 
-    The above applies to the Derivative Work as incorporated in a 
-    Collective Work, but this does not require the Collective Work 
-    apart from the Derivative Work itself to be made subject to the 
+    or the Uniform Resource Identifier for, this License or other
+    license specified in the previous sentence with every copy or
+    phonorecord of each Derivative Work You distribute, publicly
+    display, publicly perform, or publicly digitally perform. You may
+    not offer or impose any terms on the Derivative Works that alter or
+    restrict the terms of this License or the recipients' exercise of
+    the rights granted hereunder, and You must keep intact all notices
+    that refer to this License and to the disclaimer of warranties.
+    You may not distribute, publicly display, publicly perform, or
+    publicly digitally perform the Derivative Work with any
+    technological measures that control access or use of the Work in a
+    manner inconsistent with the terms of this License Agreement.
+    The above applies to the Derivative Work as incorporated in a
+    Collective Work, but this does not require the Collective Work
+    apart from the Derivative Work itself to be made subject to the
     terms of this License.
-    3. If you distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Work or any Derivative Works or 
-    Collective Works, You must keep intact all copyright notices for 
-    the Work and provide, reasonable to the medium or means You are 
-    utilizing: (i) the name of the Original Author (or pseudonym, if 
-    applicable) if supplied, and/or (ii) if the Original Author and/or 
-    Licensor designate another party or parties (e.g. a sponsor 
+    3. If you distribute, publicly display, publicly perform, or
+    publicly digitally perform the Work or any Derivative Works or
+    Collective Works, You must keep intact all copyright notices for
+    the Work and provide, reasonable to the medium or means You are
+    utilizing: (i) the name of the Original Author (or pseudonym, if
+    applicable) if supplied, and/or (ii) if the Original Author and/or
+    Licensor designate another party or parties (e.g. a sponsor
     institute, publishing entity, journal) for attribution in Licensor's
     copyright notice, terms of service or by other reasonable means, the
     name of such party or parties; the title of the Work if supplied; to
-    the extent reasonably practicable, the Uniform Resource Identifier, 
-    if any, that Licensor specifies to be associated with the Work, 
-    unless such URI does not refer to the copyright notice or licensing 
-    information for the Work; and in the case of a Derivative Work, a 
+    the extent reasonably practicable, the Uniform Resource Identifier,
+    if any, that Licensor specifies to be associated with the Work,
+    unless such URI does not refer to the copyright notice or licensing
+    information for the Work; and in the case of a Derivative Work, a
     credit identifying the use of the Work in the Derivative Work (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay 
-    based on original Work by Original Author"). Such credit may be 
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). Such credit may be
     implemented in any reasonable manner; provided, however, that in the
-    case of a Derivative Work or Collective Work, at a minimum such 
-    credit will appear where any other comparable authorship credit 
-    appears and in a manner at least as prominent as such other 
+    case of a Derivative Work or Collective Work, at a minimum such
+    credit will appear where any other comparable authorship credit
+    appears and in a manner at least as prominent as such other
     comparable authorship credit.
- . 
+ .
  5. Representations, Warranties and Disclaimer
- . 
- UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS 
- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND 
- CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, 
- INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, 
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF 
- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF 
- ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW 
- THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY 
+ .
+ UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+ CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
  TO YOU.
- . 
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE 
- LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR 
- ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES 
- ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR 
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- . 
+ .
  7. Termination
- . 
-    1. This License and the rights granted hereunder will terminate 
-    automatically upon any breach by You of the terms of this License. 
-    Individuals or entities who have received Derivative Works or 
-    Collective Works from You under this License, however, will not have 
-    their licenses terminated provided such individuals or entities 
-    remain in full compliance with those licenses. Sections 1, 2, 5, 6, 
+ .
+    1. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Derivative Works or
+    Collective Works from You under this License, however, will not have
+    their licenses terminated provided such individuals or entities
+    remain in full compliance with those licenses. Sections 1, 2, 5, 6,
     7, and 8 will survive any termination of this License.
-    2. Subject to the above terms and conditions, the license granted 
-    here is perpetual (for the duration of the applicable copyright in 
-    the Work). Notwithstanding the above, Licensor reserves the right to 
-    release the Work under different license terms or to stop 
-    distributing the Work at any time; provided, however that any such 
-    election will not serve to withdraw this License (or any other 
-    license that has been, or is required to be, granted under the terms 
-    of this License), and this License will continue in full force and 
+    2. Subject to the above terms and conditions, the license granted
+    here is perpetual (for the duration of the applicable copyright in
+    the Work). Notwithstanding the above, Licensor reserves the right to
+    release the Work under different license terms or to stop
+    distributing the Work at any time; provided, however that any such
+    election will not serve to withdraw this License (or any other
+    license that has been, or is required to be, granted under the terms
+    of this License), and this License will continue in full force and
     effect unless terminated as stated above.
- . 
+ .
  8. Miscellaneous
- . 
-    1. Each time You distribute or publicly digitally perform the Work 
-    or a Collective Work, the Licensor offers to the recipient a license 
-    to the Work on the same terms and conditions as the license granted 
+ .
+    1. Each time You distribute or publicly digitally perform the Work
+    or a Collective Work, the Licensor offers to the recipient a license
+    to the Work on the same terms and conditions as the license granted
     to You under this License.
-    2. Each time You distribute or publicly digitally perform a 
-    Derivative Work, Licensor offers to the recipient a license to the 
-    original Work on the same terms and conditions as the license 
+    2. Each time You distribute or publicly digitally perform a
+    Derivative Work, Licensor offers to the recipient a license to the
+    original Work on the same terms and conditions as the license
     granted to You under this License.
     3. If any provision of this License is invalid or unenforceable under
     applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further 
-    action by the parties to this agreement, such provision shall be 
-    reformed to the minimum extent necessary to make such provision 
+    the remainder of the terms of this License, and without further
+    action by the parties to this agreement, such provision shall be
+    reformed to the minimum extent necessary to make such provision
     valid and enforceable.
-    4. No term or provision of this License shall be deemed waived and 
-    no breach consented to unless such waiver or consent shall be in 
-    writing and signed by the party to be charged with such waiver or 
+    4. No term or provision of this License shall be deemed waived and
+    no breach consented to unless such waiver or consent shall be in
+    writing and signed by the party to be charged with such waiver or
     consent.
-    5. This License constitutes the entire agreement between the parties 
-    with respect to the Work licensed here. There are no understandings, 
-    agreements or representations with respect to the Work not specified 
-    here. Licensor shall not be bound by any additional provisions that 
-    may appear in any communication from You. This License may not be 
-    modified without the mutual written agreement of the Licensor and 
+    5. This License constitutes the entire agreement between the parties
+    with respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and
     You.
- . 
- Creative Commons is not a party to this License, and makes no warranty 
- whatsoever in connection with the Work. Creative Commons will not be 
- liable to You or any party on any legal theory for any damages 
- whatsoever, including without limitation any general, special, 
- incidental or consequential damages arising in connection to this 
- license. Notwithstanding the foregoing two (2) sentences, if Creative 
- Commons has expressly identified itself as the Licensor hereunder, 
+ .
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder,
  it shall have all rights and obligations of Licensor.
- . 
- Except for the limited purpose of indicating to the public that the 
- Work is licensed under the CCPL, neither party will use the trademark 
- "Creative Commons" or any related trademark or logo of Creative Commons 
- without the prior written consent of Creative Commons. Any permitted 
- use will be in compliance with Creative Commons' then-current trademark 
- usage guidelines, as may be published on its website or otherwise made 
+ .
+ Except for the limited purpose of indicating to the public that the
+ Work is licensed under the CCPL, neither party will use the trademark
+ "Creative Commons" or any related trademark or logo of Creative Commons
+ without the prior written consent of Creative Commons. Any permitted
+ use will be in compliance with Creative Commons' then-current trademark
+ usage guidelines, as may be published on its website or otherwise made
  available upon request from time to time.
- . 
+ .
  Creative Commons may be contacted at http://creativecommons.org/
 
 License: LGPL-3.0

=== modified file 'debian/libubuntugestures5-dev.install'
--- debian/libubuntugestures5-dev.install	2016-01-22 10:16:44 +0000
+++ debian/libubuntugestures5-dev.install	2016-04-04 04:42:19 +0000
@@ -1,34 +1,34 @@
-usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
+usr/include/*/qt5/UbuntuGestures/AbstractTimer
+usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
 usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
+usr/include/*/qt5/UbuntuGestures/DebugHelpers
+usr/include/*/qt5/UbuntuGestures/FakeTimeSource
+usr/include/*/qt5/UbuntuGestures/FakeTimer
+usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
+usr/include/*/qt5/UbuntuGestures/Pool
+usr/include/*/qt5/UbuntuGestures/RealTimeSource
+usr/include/*/qt5/UbuntuGestures/SharedTimeSource
+usr/include/*/qt5/UbuntuGestures/TimeSource
+usr/include/*/qt5/UbuntuGestures/Timer
+usr/include/*/qt5/UbuntuGestures/TimerFactory
 usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
+usr/include/*/qt5/UbuntuGestures/TouchRegistry
 usr/include/*/qt5/UbuntuGestures/UbuntuGestures
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
+usr/include/*/qt5/UbuntuGestures/debughelpers.h
 usr/include/*/qt5/UbuntuGestures/pool.h
-usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
-usr/include/*/qt5/UbuntuGestures/DebugHelpers
-usr/include/*/qt5/UbuntuGestures/debughelpers.h
+usr/include/*/qt5/UbuntuGestures/timer.h
+usr/include/*/qt5/UbuntuGestures/timesource.h
 usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
 usr/include/*/qt5/UbuntuGestures/touchregistry.h
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
-usr/include/*/qt5/UbuntuGestures/timesource.h
-usr/include/*/qt5/UbuntuGestures/TimeSource
-usr/include/*/qt5/UbuntuGestures/timer.h
-usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
-usr/include/*/qt5/UbuntuGestures/TouchRegistry
-usr/include/*/qt5/UbuntuGestures/Pool
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
 usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
-usr/include/*/qt5/UbuntuGestures/Timer
-usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
-usr/include/*/qt5/UbuntuGestures/TimerFactory
-usr/include/*/qt5/UbuntuGestures/AbstractTimer
-usr/include/*/qt5/UbuntuGestures/FakeTimeSource
-usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
-usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
-usr/include/*/qt5/UbuntuGestures/RealTimeSource
-usr/include/*/qt5/UbuntuGestures/SharedTimeSource
-usr/include/*/qt5/UbuntuGestures/FakeTimer
+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
+usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.prl
-usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.so
 usr/lib/*/pkgconfig/UbuntuGestures.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri

=== modified file 'debian/libubuntugestures5-private-dev.install'
--- debian/libubuntugestures5-private-dev.install	2015-12-17 15:42:25 +0000
+++ debian/libubuntugestures5-private-dev.install	2016-04-04 04:42:19 +0000
@@ -1,3 +1,3 @@
+usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/damper_p.h
 usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/ucswipearea_p.h
 usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/ucswipearea_p_p.h
-usr/include/*/qt5/UbuntuGestures/*/UbuntuGestures/private/damper_p.h

=== modified file 'debian/libubuntutoolkit5-dev.install'
--- debian/libubuntutoolkit5-dev.install	2016-02-12 08:52:18 +0000
+++ debian/libubuntutoolkit5-dev.install	2016-04-04 04:42:19 +0000
@@ -1,14 +1,16 @@
+usr/include/*/qt5/UbuntuToolkit/AsyncLoader
 usr/include/*/qt5/UbuntuToolkit/ColorUtils
-usr/include/*/qt5/UbuntuToolkit/colorutils.h
 usr/include/*/qt5/UbuntuToolkit/Tree
-usr/include/*/qt5/UbuntuToolkit/tree.h
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
+usr/include/*/qt5/UbuntuToolkit/asyncloader.h
+usr/include/*/qt5/UbuntuToolkit/colorutils.h
+usr/include/*/qt5/UbuntuToolkit/tree.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
+usr/lib/*/libUbuntuToolkit.la
 usr/lib/*/libUbuntuToolkit.prl
-usr/lib/*/libUbuntuToolkit.la
 usr/lib/*/libUbuntuToolkit.so
 usr/lib/*/pkgconfig/UbuntuToolkit.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri

=== added file 'debian/libubuntutoolkit5-private-dev.install'
--- debian/libubuntutoolkit5-private-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntutoolkit5-private-dev.install	2016-04-04 04:42:19 +0000
@@ -0,0 +1,1 @@
+usr/include/*/qt5/UbuntuToolkit/*/UbuntuToolkit/private/*_p.h

=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install' => 'debian/qml-module-ubuntu-components.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2015-09-22 05:58:02 +0000
+++ debian/qml-module-ubuntu-components.install	2016-04-04 04:42:19 +0000
@@ -1,33 +1,25 @@
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
-usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
 usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
-usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
-usr/lib/*/qt5/qml/Ubuntu/Components/artwork
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Test
+usr/lib/*/qt5/qml/Ubuntu/Components/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
+usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo

=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.lintian-overrides' => 'debian/qml-module-ubuntu-components.lintian-overrides'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.lintian-overrides	2013-02-26 07:55:20 +0000
+++ debian/qml-module-ubuntu-components.lintian-overrides	2016-04-04 04:42:19 +0000
@@ -1,1 +1,1 @@
-qtdeclarative5-ubuntu-ui-toolkit-plugin: image-file-in-usr-lib
+qml-module-ubuntu-components: image-file-in-usr-lib

=== added file 'debian/qml-module-ubuntu-layouts.install'
--- debian/qml-module-ubuntu-layouts.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-layouts.install	2016-04-04 04:42:19 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
+usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir

=== added file 'debian/qml-module-ubuntu-performancemetrics.install'
--- debian/qml-module-ubuntu-performancemetrics.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-performancemetrics.install	2016-04-04 04:42:19 +0000
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir

=== added file 'debian/qml-module-ubuntu-test.install'
--- debian/qml-module-ubuntu-test.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-test.install	2016-04-04 04:42:19 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/Ubuntu/Test

=== modified file 'debian/ubuntu-app-launch-profiler.install'
--- debian/ubuntu-app-launch-profiler.install	2016-03-12 17:38:04 +0000
+++ debian/ubuntu-app-launch-profiler.install	2016-04-04 04:42:19 +0000
@@ -1,4 +1,4 @@
 usr/bin/app-launch-profiler-lttng
+usr/bin/app-launch-tracepoints
 usr/bin/appstart_test
-usr/bin/app-launch-tracepoints
 usr/bin/profile_appstart.sh

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2015-08-06 11:50:01 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2016-04-04 04:42:19 +0000
@@ -1,2 +1,2 @@
+usr/lib/*/ubuntu-ui-toolkit/apicheck
 usr/lib/python3
-usr/lib/*/ubuntu-ui-toolkit/apicheck

=== modified file 'debian/ubuntu-ui-toolkit-doc.install'
--- debian/ubuntu-ui-toolkit-doc.install	2015-06-17 10:01:58 +0000
+++ debian/ubuntu-ui-toolkit-doc.install	2016-04-04 04:42:19 +0000
@@ -1,2 +1,2 @@
+usr/share/qt5/doc
 usr/share/ubuntu-ui-toolkit/doc
-usr/share/qt5/doc

=== modified file 'debian/ubuntu-ui-toolkit-theme.install'
--- debian/ubuntu-ui-toolkit-theme.install	2015-05-02 05:47:27 +0000
+++ debian/ubuntu-ui-toolkit-theme.install	2016-04-04 04:42:19 +0000
@@ -1,17 +1,17 @@
-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/Ambiance/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/qmldir
 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/SuruDark/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/parent_theme
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/artwork
 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
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/qmldir

=== modified file 'documentation/css/qtquick.css'
--- documentation/css/qtquick.css	2013-07-25 13:19:45 +0000
+++ documentation/css/qtquick.css	2016-04-04 04:42:19 +0000
@@ -473,8 +473,19 @@
         color: red;
     }
 
-    .qmldoc
-    {
+    /* The `#details ~ ul` selector is used because there is no other way to
+     * target the content without overwriting the default styles of the page.
+     * A better solution would be to reset the list style on the parts where
+     * this style is required instead of doing it by default. */
+    .qmldoc ul,
+    #details ~ ul
+    {
+        margin: 0 10px 10px;
+    }
+    .qmldoc li,
+    #details ~ ul li
+    {
+        list-style: disc inside none;
     }
 
     .generic .alphaChar{

=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-12-14 08:59:36 +0000
+++ documentation/ubuntu-theming.qdoc	2016-04-04 04:42:19 +0000
@@ -337,6 +337,7 @@
  * \qml
  * import QtQuick 2.4
  * import Ubuntu.Components 1.3
+ * import Ubuntu.Components.Popups 1.3
  * MainView {
  *     width: units.gu(40)
  *     height: units.gu(71)

=== added file 'examples/calculator/calculator.apparmor'
--- examples/calculator/calculator.apparmor	1970-01-01 00:00:00 +0000
+++ examples/calculator/calculator.apparmor	2016-04-04 04:42:19 +0000
@@ -0,0 +1,8 @@
+{
+    "policy_groups": [
+    ],
+    "policy_version": 1.3
+}
+
+
+

=== modified file 'examples/calculator/calculator.desktop'
--- examples/calculator/calculator.desktop	2013-07-02 10:59:12 +0000
+++ examples/calculator/calculator.desktop	2016-04-04 04:42:19 +0000
@@ -1,8 +1,10 @@
 [Desktop Entry]
-Name=calculator
+Name=Calculator
 Comment=My project description
-Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/calculator/calculator.qml
-Icon=qmlscene
+Exec=qmlscene $@ calculator.qml
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.bzoltan.calculator
+Icon=calculator.png
+

=== added file 'examples/calculator/calculator.png'
Binary files examples/calculator/calculator.png	1970-01-01 00:00:00 +0000 and examples/calculator/calculator.png	2016-04-04 04:42:19 +0000 differ
=== modified file 'examples/calculator/calculator.pro'
--- examples/calculator/calculator.pro	2015-06-15 13:55:18 +0000
+++ examples/calculator/calculator.pro	2016-04-04 04:42:19 +0000
@@ -1,20 +1,47 @@
 TEMPLATE = subdirs
 
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = calculator
+
 SUBDIRS += components
 
-filetypes = qml png svg js qmltheme jpg qmlproject desktop wav
-
-OTHER_FILES = ""
-
-for(filetype, filetypes) {
-  OTHER_FILES += *.$$filetype
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true) \
+             components
+
+CONF_FILES +=  $${TARGET}.apparmor \
+               $${TARGET}.png \
+	       $${TARGET}.wav
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${TARGET}.desktop \
+            ``
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = $${TARGET}.desktop
+desktop_file.CONFIG += no_check_exist
+
+exists($$PWD/../examples.pro) {
+	desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
 }
 
-desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/calculator
-desktop_files.files = calculator.desktop
-
-other_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/calculator
-other_files.files = $$OTHER_FILES
-
-INSTALLS += other_files desktop_files
-
+INSTALLS+=config_files qml_files desktop_file

=== removed file 'examples/calculator/calculator.qmlproject'
--- examples/calculator/calculator.qmlproject	2013-07-02 10:59:12 +0000
+++ examples/calculator/calculator.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "calculator.qml"
-    
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        directory: "html"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/*/qt5/qml" ]
-}

=== added file 'examples/calculator/manifest.json.in'
--- examples/calculator/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/calculator/manifest.json.in	2016-04-04 04:42:19 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "calculator.bzoltan",
+    "description": "Example application of the Ubuntu UI Toolkit - Calculator",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Calculator",
+    "hooks": {
+        "calculator": {
+            "apparmor": "calculator.apparmor",
+            "desktop": "calculator.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "Zoltán Balogh <[e-mail]>",
+    "framework": "ubuntu-sdk-15.04"
+}

=== modified file 'examples/customtheme/customtheme.desktop'
--- examples/customtheme/customtheme.desktop	2014-12-04 07:18:58 +0000
+++ examples/customtheme/customtheme.desktop	2016-04-04 04:42:19 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=customtheme
 Exec=qmlscene $@ main.qml
-Icon=customtheme.png
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
-
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.zsombi.customtheme
+Icon=customtheme.png

=== added file 'examples/customtheme/customtheme.png'
Binary files examples/customtheme/customtheme.png	1970-01-01 00:00:00 +0000 and examples/customtheme/customtheme.png	2016-04-04 04:42:19 +0000 differ
=== modified file 'examples/customtheme/customtheme.pro'
--- examples/customtheme/customtheme.pro	2015-06-15 08:53:40 +0000
+++ examples/customtheme/customtheme.pro	2016-04-04 04:42:19 +0000
@@ -1,18 +1,44 @@
-TEMPLATE = aux
-
-filetypes = qml png svg js jpg qmlproject desktop
-
-OTHER_FILES = theme/parent_theme
-
-for(filetype, filetypes) {
-  OTHER_FILES += *.$$filetype
-  OTHER_FILES += theme/*.$$filetype
+TEMPLATE = subdirs
+
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = customtheme
+
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  $${TARGET}.apparmor \
+               $${TARGET}.png \
+	       $${TARGET}.wav \
+               theme/parent_theme
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${TARGET}.desktop 
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = $${TARGET}.desktop
+desktop_file.CONFIG += no_check_exist
+
+exists($$PWD/../examples.pro) {
+	desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
 }
 
-desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/
-desktop_files.files = customtheme.desktop
-
-other_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/customtheme
-other_files.files = $$OTHER_FILES
-
-INSTALLS += other_files desktop_files
+INSTALLS+=config_files qml_files desktop_file

=== removed file 'examples/customtheme/customtheme.qmlproject'
--- examples/customtheme/customtheme.qmlproject	2014-12-04 07:18:58 +0000
+++ examples/customtheme/customtheme.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        filter: "www/*.html"
-    }
-    Files {
-        filter: "Makefile"
-    }
-    Files {
-        filter: "*.apparmor"
-    }
-    Files {
-        directory: "."
-        paths: ["manifest.json",".excludes"]
-    }
-    Files {
-        directory: "www"
-        filter: "*"
-    }
-    Files {
-        directory: "www/img/"
-        filter: "*"
-    }
-    Files {
-        directory: "www/css/"
-        filter: "*"
-    }
-    Files {
-        directory: "www/js/"
-        filter: "*"
-    }
-    Files {
-        directory: "tests/"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}
-

=== added file 'examples/customtheme/manifest.json.in'
--- examples/customtheme/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/customtheme/manifest.json.in	2016-04-04 04:42:19 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "customtheme.zsombi",
+    "description": "Example application of the Ubuntu UI Toolkit - Jokes",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Jokes",
+    "hooks": {
+        "customtheme": {
+            "apparmor": "customtheme.apparmor",
+            "desktop": "customtheme.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "Zsombor Egri <[e-mail]>",
+    "framework": "ubuntu-sdk-15.04"
+}

=== added file 'examples/examples.pro'
--- examples/examples.pro	1970-01-01 00:00:00 +0000
+++ examples/examples.pro	2016-04-04 04:42:19 +0000
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    ubuntu-ui-toolkit-gallery\
+    locale \
+    jokes \
+    unit-converter \
+    calculator \
+    customtheme

=== removed file 'examples/examples.pro'
--- examples/examples.pro	2015-05-05 16:23:29 +0000
+++ examples/examples.pro	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    ubuntu-ui-toolkit-gallery\
-    locale \
-    jokes \
-    unit-converter \
-    calculator \
-    customtheme

=== added file 'examples/jokes/jokes.apparmor'
--- examples/jokes/jokes.apparmor	1970-01-01 00:00:00 +0000
+++ examples/jokes/jokes.apparmor	2016-04-04 04:42:19 +0000
@@ -0,0 +1,7 @@
+{
+    "policy_groups": [
+        "networking",
+        "audio"
+    ],
+    "policy_version": 1.3
+}

=== modified file 'examples/jokes/jokes.desktop'
--- examples/jokes/jokes.desktop	2013-05-07 10:33:22 +0000
+++ examples/jokes/jokes.desktop	2016-04-04 04:42:19 +0000
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Name=converter
-Comment=My project description
-Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/jokes/jokes.qml
+Name=Jokes
+Exec=qmlscene $@ jokes.qml
 Icon=qmlscene
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.bzoltan.jokes
+Icon=jokes.png
+
+

=== added file 'examples/jokes/jokes.png'
Binary files examples/jokes/jokes.png	1970-01-01 00:00:00 +0000 and examples/jokes/jokes.png	2016-04-04 04:42:19 +0000 differ
=== modified file 'examples/jokes/jokes.pro'
--- examples/jokes/jokes.pro	2015-06-15 08:53:40 +0000
+++ examples/jokes/jokes.pro	2016-04-04 04:42:19 +0000
@@ -1,18 +1,43 @@
 TEMPLATE = subdirs
 
-filetypes = qml png svg js jpg qmlproject desktop wav
-
-OTHER_FILES = ""
-
-for(filetype, filetypes) {
-  OTHER_FILES += *.$$filetype
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = jokes
+
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  $${TARGET}.apparmor \
+               $${TARGET}.png \
+	       $${TARGET}.wav
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${TARGET}.desktop
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = $${TARGET}.desktop
+desktop_file.CONFIG += no_check_exist
+
+exists($$PWD/../examples.pro) {
+	desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
 }
 
-desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/jokes
-desktop_files.files = jokes.desktop
-
-other_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/jokes
-other_files.files = $$OTHER_FILES
-
-INSTALLS += other_files desktop_files
-
+INSTALLS+=config_files qml_files desktop_file

=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2015-09-21 14:44:13 +0000
+++ examples/jokes/jokes.qml	2016-04-04 04:42:19 +0000
@@ -84,7 +84,7 @@
 
     SoundEffect {
         id: laugh
-        source: "laugh.wav"
+        source: "jokes.wav"
     }
 
     UbuntuShape {

=== removed file 'examples/jokes/jokes.qmlproject'
--- examples/jokes/jokes.qmlproject	2013-05-06 16:24:50 +0000
+++ examples/jokes/jokes.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "jokes.qml"
-    
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        directory: "html"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/*/qt5/qml" ]
-}

=== renamed file 'examples/jokes/laugh.wav' => 'examples/jokes/jokes.wav'
=== added file 'examples/jokes/manifest.json.in'
--- examples/jokes/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/jokes/manifest.json.in	2016-04-04 04:42:19 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "jokes.bzoltan",
+    "description": "Example application of the Ubuntu UI Toolkit - Jokes",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Jokes",
+    "hooks": {
+        "jokes": {
+            "apparmor": "jokes.apparmor",
+            "desktop": "jokes.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "Zoltán Balogh <[e-mail]>",
+    "framework": "ubuntu-sdk-15.04"
+}

=== added file 'examples/locale/locale.apparmor'
--- examples/locale/locale.apparmor	1970-01-01 00:00:00 +0000
+++ examples/locale/locale.apparmor	2016-04-04 04:42:19 +0000
@@ -0,0 +1,8 @@
+{
+    "policy_groups": [
+    ],
+    "policy_version": 1.3
+}
+
+
+

=== modified file 'examples/locale/locale.desktop'
--- examples/locale/locale.desktop	2013-05-07 10:33:22 +0000
+++ examples/locale/locale.desktop	2016-04-04 04:42:19 +0000
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Name=Locale
 Comment=My project description
-Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/locale/locale.qml
+Exec=qmlscene $@ locale.qml
 Icon=qmlscene
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.bzoltan.locale

=== added file 'examples/locale/locale.png'
Binary files examples/locale/locale.png	1970-01-01 00:00:00 +0000 and examples/locale/locale.png	2016-04-04 04:42:19 +0000 differ
=== modified file 'examples/locale/locale.pro'
--- examples/locale/locale.pro	2015-06-15 13:55:18 +0000
+++ examples/locale/locale.pro	2016-04-04 04:42:19 +0000
@@ -1,19 +1,42 @@
-TEMPLATE = aux
-
-filetypes = qml png svg js jpg qmlproject desktop
-
-OTHER_FILES = ""
-
-for(filetype, filetypes) {
-  OTHER_FILES += *.$$filetype
+TEMPLATE = subdirs
+
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = locale
+
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  $${TARGET}.apparmor \
+               $${TARGET}.png
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${TARGET}.desktop
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = $${TARGET}.desktop
+desktop_file.CONFIG += no_check_exist
+
+exists($$PWD/../examples.pro) {
+	desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
 }
 
-
-desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/locale
-desktop_files.files = locale.desktop
-
-other_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/locale
-other_files.files = $$OTHER_FILES
-
-INSTALLS += other_files desktop_files
-
+INSTALLS+=config_files qml_files desktop_file

=== removed file 'examples/locale/locale.qmlproject'
--- examples/locale/locale.qmlproject	2013-05-02 00:01:27 +0000
+++ examples/locale/locale.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "locale.qml"
-    
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        directory: "html"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/i386-linux-gnu/qt5/qml" ]
-}

=== added file 'examples/locale/manifest.json.in'
--- examples/locale/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/locale/manifest.json.in	2016-04-04 04:42:19 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "locale.bzoltan",
+    "description": "Example application of the Ubuntu UI Toolkit - Locale",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Locale",
+    "hooks": {
+        "locale": {
+            "apparmor": "locale.apparmor",
+            "desktop": "locale.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "Zoltán Balogh <[e-mail]>",
+    "framework": "ubuntu-sdk-15.04"
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-01-13 16:07:58 +0000
+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-04-04 04:42:19 +0000
@@ -36,7 +36,7 @@
                 spacing: units.gu(1)
                 CheckBox {
                     id: contentToLayout
-                    text: i18n.tr("push content into the layout")
+                    text: i18n.tr("push content into the column")
                     enabled: bottomEdge.hint.status >= BottomEdgeHint.Active
                 }
                 Label {
@@ -52,20 +52,38 @@
         className: "BottomEdge"
 
         TemplateRow {
+            title: i18n.tr("Content")
+            Row {
+                spacing: units.gu(1)
+                CheckBox {
+                    id: preloadContent
+                    text: i18n.tr("preload content")
+                    checked: bottomEdge.preloadContent
+                    onTriggered: bottomEdge.preloadContent = checked
+                }
+                Label {
+                    text: preloadContent.text
+                    anchors.verticalCenter: preloadContent.verticalCenter
+                }
+            }
+        }
+
+        TemplateFlow {
             title: i18n.tr("Top")
             Slider {
                 id: bottomEdgeHeight
+                width: Math.min(units.gu(30), parent.width)
                 maximumValue: page.height
                 value: bottomEdge.height
                 onValueChanged: bottomEdge.height = value
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Regions")
             Slider {
                 id: regionCount
-                width: units.gu(20)
+                width: Math.min(units.gu(20), parent.width)
                 maximumValue: 3.0
                 live: true
             }
@@ -133,12 +151,28 @@
                 enabled: regionConfig.model >= 1
                 to: 0.3
                 property color baseColor: UbuntuColors.silk
+                contentComponent: Rectangle {
+                    PageHeader {
+                        title: i18n.tr("CustomRegion #1")
+                    }
+                    width: bottomEdge.width - units.gu(10)
+                    height: bottomEdge.height
+                    color: UbuntuColors.blue
+                }
             },
             BottomEdgeRegion {
                 objectName: "CustomRegion2"
                 enabled: regionConfig.model >= 2
                 from: 0.3
                 to: 0.6
+                contentComponent: Rectangle {
+                    PageHeader {
+                        title: i18n.tr("CustomRegion #2")
+                    }
+                    width: bottomEdge.width - units.gu(30)
+                    height: bottomEdge.height
+                    color: UbuntuColors.red
+                }
             },
             BottomEdgeRegion {
                 objectName: "CustomRegion3"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-12-21 20:17:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2016-04-04 04:42:19 +0000
@@ -117,7 +117,10 @@
             // Used by Autopilot
             property string text: label
             onClicked: widgetList.currentIndex = index
+            //follow ListItemLayout size
+            height: layout.height + (divider.visible ? divider.height : 0)
             ListItemLayout {
+                id: layout
                 title.text: label
                 ProgressionSlot {}
             }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-01-13 16:14:08 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-04-04 04:42:19 +0000
@@ -34,19 +34,16 @@
     }
 
     ScrollView {
-        //anchors.fill: parent
-        //anchors.topMargin: template.header.flickable ? 0 : template.header.height
         objectName: "TemplateScrollView"
         anchors {
             fill: parent
             topMargin: template.header.flickable ? 0 : template.header.height
         }
+
         Flickable {
             id: templateFlickable
             objectName: "TemplateFlickable"
             anchors.fill: parent
-            topMargin: units.gu(2)
-            bottomMargin: units.gu(2)
             contentHeight: column.height
             interactive: contentHeight > height
             Column {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2016-01-25 15:25:25 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2016-04-04 04:42:19 +0000
@@ -2,7 +2,7 @@
 
 SUBDIRS += po
 
-filetypes = qml png svg js jpg qmlproject desktop
+filetypes = qml png svg js jpg pro desktop
 
 OTHER_FILES = ""
 

=== removed file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qmlproject'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qmlproject	2013-06-27 14:24:02 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "ubuntu-ui-toolkit-gallery.qml"
-    
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        directory: "html"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/i386-linux-gnu/qt5/qml" ]
-}

=== added file 'examples/unit-converter/manifest.json.in'
--- examples/unit-converter/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/unit-converter/manifest.json.in	2016-04-04 04:42:19 +0000
@@ -0,0 +1,15 @@
+{
+    "name": "unit-converter.bzoltan",
+    "description": "Example application of the Ubuntu UI Toolkit - Unit converter",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Unit Converter",
+    "hooks": {
+        "unit-converter": {
+            "apparmor": "unit-converter.apparmor",
+            "desktop": "unit-converter.desktop"
+        }
+    },
+    "version": "0.1",
+    "maintainer": "Zoltán Balogh <[e-mail]>",
+    "framework": "ubuntu-sdk-15.04"
+}

=== added file 'examples/unit-converter/unit-converter.apparmor'
--- examples/unit-converter/unit-converter.apparmor	1970-01-01 00:00:00 +0000
+++ examples/unit-converter/unit-converter.apparmor	2016-04-04 04:42:19 +0000
@@ -0,0 +1,8 @@
+{
+    "policy_groups": [
+    ],
+    "policy_version": 1.3
+}
+
+
+

=== modified file 'examples/unit-converter/unit-converter.desktop'
--- examples/unit-converter/unit-converter.desktop	2013-05-07 10:33:22 +0000
+++ examples/unit-converter/unit-converter.desktop	2016-04-04 04:42:19 +0000
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Name=converter
+Name=unit-converter
 Comment=My project description
-Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/unit-converter/unit-converter.qml
+Exec=qmlscene $@ unit-converter.qml
 Icon=qmlscene
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.bzoltan.unit-converter

=== added file 'examples/unit-converter/unit-converter.png'
Binary files examples/unit-converter/unit-converter.png	1970-01-01 00:00:00 +0000 and examples/unit-converter/unit-converter.png	2016-04-04 04:42:19 +0000 differ
=== modified file 'examples/unit-converter/unit-converter.pro'
--- examples/unit-converter/unit-converter.pro	2015-06-15 08:53:40 +0000
+++ examples/unit-converter/unit-converter.pro	2016-04-04 04:42:19 +0000
@@ -1,19 +1,42 @@
-TEMPLATE = aux
-
-filetypes = qml png svg js jpg qmlproject desktop
-
-OTHER_FILES = ""
-
-for(filetype, filetypes) {
-  OTHER_FILES += *.$$filetype
+TEMPLATE = subdirs
+
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = unit-converter
+
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  $${TARGET}.apparmor \
+               $${TARGET}.png
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${TARGET}.desktop
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = $${TARGET}.desktop
+desktop_file.CONFIG += no_check_exist
+
+exists($$PWD/../examples.pro) {
+	desktop_file.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	config_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
+	qml_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/$${TARGET}
 }
 
-
-desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/unit-converter
-desktop_files.files = unit-converter.desktop
-
-other_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/unit-converter
-other_files.files = $$OTHER_FILES
-
-INSTALLS += other_files desktop_files
-
+INSTALLS+=config_files qml_files desktop_file

=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2015-09-21 14:44:13 +0000
+++ examples/unit-converter/unit-converter.qml	2016-04-04 04:42:19 +0000
@@ -25,20 +25,19 @@
     - i18n
     - units
     - Label
-    - Tabs
-    - Tab
+    - Loader
     - Page
-    - ToolbarActions
+    - PageHeader
     - Action
     - TextField and
     - Button components
 
   The application converts length and weight units between several metrics.
-  Related units are grouped in the same page (Tab) and conversion happens when
+  Related units are grouped in the same page and conversion happens when
   pressing Enter/Return after entering a number in one of the input fields (i.e.
   accepting the entered text), or by pressing the "Convert" button.
 
-  The navigation between converter pages is provided by the Tabs component.
+  The navigation between converter pages is provided by the PageHeader component.
 */
 
 MainView {
@@ -85,6 +84,42 @@
     Component {
         id: pageContent
         Page {
+            header: PageHeader {
+                title: "Ubuntu header"
+                leadingActionBar.actions: [
+                    Action {
+                        text: "Lengths"
+                        onTriggered: {
+                            if (status === Loader.Ready && item) {
+                                item.parent = parent;
+                                item.model = lengthModel;
+                                header.title="Lengths"
+                            }
+                        }
+                    },
+                    Action {
+                        text: "Weights"
+                        onTriggered: {
+                            if (status === Loader.Ready && item) {
+                                item.parent = parent;
+                                item.model = weightModel;
+                                header.title="Weights"
+
+                            }
+                        }
+                    }
+                ]
+                trailingActionBar.actions: [
+                    Action {
+                        objectName: "action"
+                        iconName: "clear"
+                        text: i18n.tr("Clear")
+                        onTriggered: Converter.clear(converter)
+                    }
+
+                ]
+            }
+
             // expose Repeater's model for reusability, so we can set it from
             // outside, when we build the tabs
             property alias model: converter.model
@@ -133,58 +168,25 @@
                                 font.pixelSize: FontUtils.sizeToPixels("large")
                                 height: units.gu(4)
                                 // on-the-fly conversion
-                                onTextChanged: if (activeFocus) Converter.convert(input, converter, index)
+                                onTextChanged: if (activeFocus) Converter.convert(input, converter, index); else cursorPosition = 0
                                 onAccepted: Qt.inputMethod.hide()
                             }
                         }
                     }
                 }
             }
-
-            head.actions: Action {
-                objectName: "action"
-                iconName: "clear"
-                text: i18n.tr("Clear")
-                onTriggered: Converter.clear(converter)
-            }
-        }
-    }
-    
-    Tabs {
-        id: tabs
-        
-        // First tab begins here
-        Tab {
-            objectName: "Tab1"
-            
-            title: i18n.tr("Lengths")
-            
-            // Tab content begins here
-            page: Loader {
-                sourceComponent: pageContent
-                onStatusChanged: {
-                    if (status === Loader.Ready && item) {
-                        item.parent = parent;
-                        item.model = lengthModel;
-                    }
-                }
-            }
-        }
-        
-        // Second tab begins here
-        Tab {
-            objectName: "Tab2"
-            
-            title: i18n.tr("Weights")
-            page: Loader {
-                sourceComponent: pageContent
-                onStatusChanged: {
-                    if (status === Loader.Ready && item) {
-                        item.parent = parent;
-                        item.model = weightModel;
-                    }
-                }
-            }
-        }
-    }
+        }
+    }
+    Loader {
+        sourceComponent: pageContent
+        onStatusChanged: {
+            if (status === Loader.Ready && item) {
+                item.parent = parent;
+                item.model = lengthModel;
+                item.header.title="Lengths"
+            }
+
+        }
+    }
+
 }

=== removed file 'examples/unit-converter/unit-converter.qmlproject'
--- examples/unit-converter/unit-converter.qmlproject	2013-05-06 16:24:50 +0000
+++ examples/unit-converter/unit-converter.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "unit-converter.qml"
-    
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    Files {
-        filter: "*.desktop"
-    }
-    Files {
-        directory: "html"
-        filter: "*"
-    }
-    Files {
-        directory: "debian"
-        filter: "*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/bin","/usr/lib/*/qt5/qml" ]
-}

=== renamed file 'export_modules_dir.sh' => 'export_qml_dir.sh'
--- export_modules_dir.sh	2016-01-20 14:34:16 +0000
+++ export_qml_dir.sh	2016-04-04 04:42:19 +0000
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 #
-# Copyright 2012 - 2015 Canonical Ltd.
+# Copyright 2012 - 2016 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
@@ -15,11 +15,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-. `dirname ${BASH_SOURCE[0]}`/build_paths.inc || return 1
+# Get the current script directory (compatible with Bash and ZSH)
+SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}`
+SCRIPT_DIR=`cd $SCRIPT_DIR && pwd`
+
+source "$SCRIPT_DIR/build_paths.inc" || return 1
 export QML_IMPORT_PATH=$BUILD_DIR/qml
 export QML2_IMPORT_PATH=$BUILD_DIR/qml
 export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
-export LD_LIBRARY_PATH=$BUILD_DIR/lib:$LD_LIBRARY_PATH
+UBUNTU_QML_ROOT=$BUILD_DIR/qml/Ubuntu
+UBUNTU_QML_DIRS=$UBUNTU_QML_ROOT/Components:$UBUNTU_QML_ROOT/Test:$UBUNTU_QML_ROOT/Layouts:$UBUNTU_QML_ROOT/PerformanceMetrics
+export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS$LD_LIBRARY_PATH
 /sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml

=== modified file 'run_tests.sh'
--- run_tests.sh	2015-01-30 11:58:40 +0000
+++ run_tests.sh	2016-04-04 04:42:19 +0000
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-source $PWD/export_modules_dir.sh
+source $PWD/export_qml_dir.sh
 
 if [ ! -e $QML2_IMPORT_PATH/Ubuntu/Layouts/libUbuntuLayouts.so ]; then
     echo You need to build UITK before you can run Autopilot test cases!

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-02-24 06:40:54 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-04-04 04:42:19 +0000
@@ -122,7 +122,7 @@
 
         AdaptivePageLayout {
             anchors.fill: parent
-            primaryPageSource: page1
+            primaryPageSource: page1Component
             layouts: PageColumnsLayout {
                 when: width > units.gu(80)
                 // column #0
@@ -339,11 +339,14 @@
       */
     function addPageToNextColumn(sourcePage, page, properties) {
         var nextColumn = d.columnForPage(sourcePage) + 1;
-        d.tree.prune(nextColumn);
+        var wrappers = d.tree.prune(nextColumn);
         return d.addPageToColumn(nextColumn, sourcePage, page, properties, function() {
             for (var i = nextColumn; i < d.columns; i++) {
                 d.updatePageForColumn(i);
             }
+            for (var i in wrappers) {
+                wrappers[i].destroyObject();
+            }
         });
     }
 
@@ -591,9 +594,7 @@
                 if (newWrapper) {
                     columnHolder.attachPage(newWrapper);
                 }
-                if (oldWrapper.canDestroy) {
-                    oldWrapper.destroyObject();
-                }
+                oldWrapper.destroyObject();
             }
         }
 
@@ -754,6 +755,19 @@
             property var page: pageWrapper ? pageWrapper.object : null
             property bool customHeader: page && page.hasOwnProperty("header") &&
                                         page.header
+            onCustomHeaderChanged: {
+                // do not change the holderBody anchors until the new page
+                //  for the column has been set to prevent geometry changes in
+                //  the current/previous page.
+                if (page) {
+                    if (customHeader) {
+                        holderBody.anchors.top = holderBody.parent.top;
+                    } else {
+                        holderBody.anchors.top = subHeader.bottom;
+                    }
+                }
+            }
+
             onPageChanged: body.updateHeaderHeight(0)
             Connections {
                 target: page
@@ -770,7 +784,7 @@
                 id: holderBody
                 objectName: parent.objectName + "Body"
                 anchors {
-                    top: customHeader ? parent.top : subHeader.bottom
+                    top: subHeader.bottom // updated in onCustomHeaderChanged
                     bottom: parent.bottom
                     left: parent.left
                     right: parent.right

=== modified file 'src/Ubuntu/Components/1.3/ScrollView.qml'
--- src/Ubuntu/Components/1.3/ScrollView.qml	2016-02-18 12:39:14 +0000
+++ src/Ubuntu/Components/1.3/ScrollView.qml	2016-04-04 04:42:19 +0000
@@ -30,6 +30,13 @@
     migrate to ScrollView, to ensure the UX is ready for convergent devices and is consistent with the
     rest of the platform.
 
+    ScrollView wraps \l {Scrollbar}(s) in a view, and provides additional features such as:
+    \list
+    \li - Keyboard navigation and focus handling, for a complete convergent experience.
+    \li - Automatic position handling of vertical and horizontal scrollbars, preventing them from
+          overlapping one another when both on screen.
+    \endlist
+
     Adding scrollbars and keyboard input handling to a QML item is as simple as wrapping that item in a
     ScrollView, as shown in the following example:
 
@@ -91,11 +98,6 @@
     */
     default property Item contentItem
 
-    /*! \internal */
-    //property alias __horizontalScrollBar: scroller.horizontalScrollBar
-    /*! \internal */
-    //property alias __verticalScrollBar: scroller.verticalScrollBar
-
     Keys.enabled: true
     Keys.onLeftPressed: {
         if (horizontalScrollbar.__styleInstance !== null) {
@@ -156,37 +158,53 @@
         internal.flickableItem.anchors.fill = viewportItem
     }
 
-    children: Item {
-        id: internal
-
-        property Flickable flickableItem
-        property real nonOverlayScrollbarMargin: verticalScrollbar.__styleInstance ? verticalScrollbar.__styleInstance.nonOverlayScrollbarMargin : 0
-        //shortScrollingRation is used for arrow keys, longScrollingRatio is used for pgUp/pgDown
-        //0.1 means we will scroll 10% of the *visible* flickable area
-        property real shortScrollingRatio: __styleInstance ? __styleInstance.shortScrollingRatio : 0.1
-        property real longScrollingRatio: __styleInstance ? __styleInstance.longScrollingRatio : 0.9
-
-        //if the flickable is not coming from the user but from our internal Component...
-        Binding {
-            target: flickableItem
-            when: contentItem !== flickableItem
-            property: "contentHeight"
-            value: contentItem ? contentItem.height : 0
-        }
-        Binding {
-            target: flickableItem
-            when: contentItem !== flickableItem
-            property: "contentWidth"
-            value: contentItem ? contentItem.width : 0
-        }
-
-        anchors.fill: parent
-
-        Component {
-            id: flickableComponent
-            Flickable {}
-        }
-
+    /*!
+        \qmlproperty Scrollbar ScrollView::horizontalScrollbar
+
+        This property holds the horizontal scrollbar used in the ScrollView.
+        It provides access to the scrollbar thus making it possible to change its properties or
+        completely replace it with a custom \l Scrollbar object.
+
+        This property defaults to an instance of \l Scrollbar.
+
+        \b NOTE: some \l Scrollbar properties are already handled by ScrollView, and their value
+        should hence not be overridden. These properties are:
+        \list
+        \li anchors margins, such as anchors.topMargin etc.
+        \li the parent Item
+        \li \l Scrollbar::flickableItem
+        \endlist
+    */
+    property Scrollbar horizontalScrollbar: Scrollbar {
+        objectName: "horizontalScrollbar"
+        align: Qt.AlignBottom
+        focus: false
+    }
+
+    /*!
+        \qmlproperty Scrollbar ScrollView::verticalScrollbar
+
+        This property holds the vertical scrollbar used in the ScrollView.
+        It provides access to the scrollbar thus making it possible to change its properties or
+        completely replace it with a custom \l Scrollbar object.
+
+        This property defaults to an instance of \l Scrollbar.
+
+        \b NOTE: some \l Scrollbar properties are already handled by ScrollView, and their value
+        should hence not be overridden. These properties are:
+        \list
+        \li anchors margins, such as anchors.topMargin etc.
+        \li the parent Item
+        \li \l Scrollbar::flickableItem
+        \endlist
+    */
+    property Scrollbar verticalScrollbar: Scrollbar {
+        objectName: "verticalScrollbar"
+        align: Qt.AlignTrailing
+        focus: false
+    }
+
+    children: [
         Item {
             id: viewportItem
             anchors.fill: parent
@@ -201,59 +219,128 @@
 
             clip: true
             focus: true
-        }
-
-        Scrollbar {
-            id: horizontalScrollbar
-            objectName: "horizontalScrollbar"
-            flickableItem: internal.flickableItem
-            __viewport: viewportItem
-            align: Qt.AlignBottom
-            __buddyScrollbar: verticalScrollbar
-            __alwaysOnScrollbars: false//alwaysOnScrollbars
-            focus: false
-        }
-
-        Scrollbar {
-            id: verticalScrollbar
-            objectName: "verticalScrollbar"
-            flickableItem: internal.flickableItem
-            __viewport: viewportItem
-            align: Qt.AlignTrailing
-            __buddyScrollbar: horizontalScrollbar
-            __alwaysOnScrollbars: false//alwaysOnScrollbars
-            focus: false
-        }
-        //When you click outside of a child of the scrollview, this restores the focus to the ScrollView
-        //Why is this needed?
-        //  Suppose the viewport has a child ScrollView (or another Item which handles some or all of the hw keys we handle).
-        //  Now, if that child is coded to set its focus to true when you tap on it (which is, for instance, what
-        //  StyledItem's activeFocusOnPress does), tapping on that child will set viewportItem.focus = false, because
-        //  that child is just another Item inside "root" and "root" is a FocusScope, and that's how FocusScope works.
-        //  At this point, we need something to restore the focus to the viewportItem once you tap on viewportItem, outside
-        //  any other child. And that's what the MouseArea below does.
-        //
-        //The alternative could be making the viewport a StyledItem and using activeFocusOnPress:true, but that wouldn't work
-        //because it would make viewportItem a focus scope, and we don't want that, because at that point,
-        //being in a similar situation as described above, we wouldn't be able to transfer the focus to viewportItem, because
-        //being a focus scope means viewportItem would forward the focus to the one between its children who asked it most
-        //recently
-        MouseArea {
+        },
+
+        Item {
+            id: internal
             anchors.fill: parent
-            onPressed: {
-                //FIXME: we can't force focus on the viewport, this breaks text selection inside scrollview!
-                //+ it still doesn't work in Sliders page, for yet unknown reasons
-                //Without this we can't shift focus from a child ScrollView to a parent ScrollView
-                //viewportItem.focus = true
-
-                //activeFocusOnPress only works if *all* the parents have activeFocusOnPress enabled
-                //Some applications (like messaging-app at the moment) have activeFocusOnPress:false on
-                //the MainView, and that would make focusing the scrollview impossible. Hence we also
-                //force it from QML side
-                root.forceActiveFocus()
-
-                mouse.accepted = false
+
+            property Flickable flickableItem
+            property real nonOverlayScrollbarMargin: verticalScrollbar.__styleInstance ? verticalScrollbar.__styleInstance.nonOverlayScrollbarMargin : 0
+            //shortScrollingRation is used for arrow keys, longScrollingRatio is used for pgUp/pgDown
+            //0.1 means we will scroll 10% of the *visible* flickable area
+            property real shortScrollingRatio: __styleInstance ? __styleInstance.shortScrollingRatio : 0.1
+            property real longScrollingRatio: __styleInstance ? __styleInstance.longScrollingRatio : 0.9
+
+            Component {
+                id: flickableComponent
+                Flickable {}
+            }
+
+            //if the flickable is not coming from the user but from our internal Component...
+            Binding {
+                target: flickableItem
+                when: contentItem !== flickableItem
+                property: "contentHeight"
+                value: contentItem ? contentItem.height : 0
+            }
+            Binding {
+                target: flickableItem
+                when: contentItem !== flickableItem
+                property: "contentWidth"
+                value: contentItem ? contentItem.width : 0
+            }
+
+            Binding {
+                when: root.verticalScrollbar
+                target: root.verticalScrollbar
+                property: "parent"
+                value: root
+            }
+            Binding {
+                when: root.horizontalScrollbar
+                target: root.horizontalScrollbar
+                property: "parent"
+                value: root
+            }
+
+            //The viewport MUST be set, when Scrollbar is used inside a ScrollView, because that is the
+            //item it will anchor to.
+            Binding {
+                //NOTE: we have to wait for the parent to be set before setting the viewport item or that
+                //will trigger anchoring errors
+                when: root.horizontalScrollbar && root.horizontalScrollbar.parent
+                target: root.horizontalScrollbar
+                property: "__viewport"
+                value: viewportItem
+            }
+            Binding {
+                when: root.verticalScrollbar && root.verticalScrollbar.parent
+                target: root.verticalScrollbar
+                property: "__viewport"
+                value: viewportItem
+            }
+
+            Binding {
+                //wait for viewport to be set, otherwise Scrollbar will try anchoring to flickableItem, which
+                //is not a parent or sibling (see definition of Scrollbar anchors) when Scrollbar is inside
+                //a ScrollView (it is a sibling usually when Scrollbar is used directly, without ScrollView)
+                when: root.horizontalScrollbar && root.horizontalScrollbar.__viewport
+                target: root.horizontalScrollbar
+                property: "flickableItem"
+                value: internal.flickableItem
+            }
+            Binding {
+                when: root.verticalScrollbar && root.verticalScrollbar.__viewport
+                target: root.verticalScrollbar
+                property: "flickableItem"
+                value: internal.flickableItem
+            }
+
+            Binding {
+                when: root.verticalScrollbar
+                target: root.verticalScrollbar
+                property: "__buddyScrollbar"
+                value: root.horizontalScrollbar
+            }
+            Binding {
+                when: root.horizontalScrollbar
+                target: root.horizontalScrollbar
+                property: "__buddyScrollbar"
+                value: root.verticalScrollbar
+            }
+
+            //When you click outside of a child of the scrollview, this restores the focus to the ScrollView
+            //Why is this needed?
+            //  Suppose the viewport has a child ScrollView (or another Item which handles some or all of the hw keys we handle).
+            //  Now, if that child is coded to set its focus to true when you tap on it (which is, for instance, what
+            //  StyledItem's activeFocusOnPress does), tapping on that child will set viewportItem.focus = false, because
+            //  that child is just another Item inside "root" and "root" is a FocusScope, and that's how FocusScope works.
+            //  At this point, we need something to restore the focus to the viewportItem once you tap on viewportItem, outside
+            //  any other child. And that's what the MouseArea below does.
+            //
+            //The alternative could be making the viewport a StyledItem and using activeFocusOnPress:true, but that wouldn't work
+            //because it would make viewportItem a focus scope, and we don't want that, because at that point,
+            //being in a similar situation as described above, we wouldn't be able to transfer the focus to viewportItem, because
+            //being a focus scope means viewportItem would forward the focus to the one between its children who asked it most
+            //recently
+            MouseArea {
+                anchors.fill: parent
+                onPressed: {
+                    //FIXME: we can't force focus on the viewport, this breaks text selection inside scrollview!
+                    //+ it still doesn't work in Sliders page, for yet unknown reasons
+                    //Without this we can't shift focus from a child ScrollView to a parent ScrollView
+                    //viewportItem.focus = true
+
+                    //activeFocusOnPress only works if *all* the parents have activeFocusOnPress enabled
+                    //Some applications (like messaging-app at the moment) have activeFocusOnPress:false on
+                    //the MainView, and that would make focusing the scrollview impossible. Hence we also
+                    //force it from QML side
+                    root.forceActiveFocus()
+
+                    mouse.accepted = false
+                }
             }
         }
-    }
+    ]
 }

=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2016-02-25 12:59:27 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2016-04-04 04:42:19 +0000
@@ -18,14 +18,19 @@
 import Ubuntu.Components 1.3 as Toolkit
 
 /*!
-    \qmltype ScrollBar
+    \qmltype Scrollbar
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
-    \brief The ScrollBar component provides scrolling functionality for
+    \brief The Scrollbar component provides scrolling functionality for
     scrollable views (i.e. Flickable, ListView).
 
-    The ScrollBar can be set to any flickable and has built-in anchoring setup
-    to the attached flickable's front, rear, top or bottom. the scrollbar can
+    \b NOTE: the Scrollbar component was revamped for OTA9 and used for the implementation
+    of \l ScrollView. Apps targeting system version OTA9 (or newer) should use ScrollView instead
+    of Scrollbar, as it features convergent-ready features, such as (but not limited to)
+    keyboard input handling.
+
+    The Scrollbar can be set to any flickable and has built-in anchoring setup
+    to the attached flickable's front, rear, top or bottom. The scrollbar can
     also be aligned using anchors, however the built-in align functionality
     makes sure to have the proper alignemt applied based on theme and layout
     direction (RTL or LTR).
@@ -57,6 +62,43 @@
         }
     }
     \endqml
+
+    \section1 Vertical Scrollbar and Flickable behaviour
+
+    Since Flickable's topMargin and bottomMargin are modified by Ubuntu components
+    such as \l BottomEdgeHint and \l Header in their positioning logic, the Scrollbar component
+    uses the value of those properties to its top and bottom anchors margins, by default. This is
+    to prevent any overlap with BottomEdgeHint or Header (see \l {Vertical Scrollbar and Header behaviour}
+    for more info about that). In case you need to specify custom Flickable
+    content margins (note: we're talking about content margins, not anchors ones), you will also have to
+    override the top and bottom anchors margins of the Scrollbar accordingly.
+
+    \section1 Vertical Scrollbar and Header behaviour
+
+    The thumb of the Scrollbar should not move or resize unexpectedly. It would be confusing,
+    for instance, if it moved under the user's finger (or pointer) while he's dragging it.
+
+    Because the size and position of the thumb in a scrollbar is related to the size of the
+    trough (or track) it slides in, it is important that the trough does not resize or move while the
+    user is interacting with the component.
+
+    In the context of a \l Page with a \l Header that slides in and out dynamically when the user
+    flicks the surface (see \l {Header::flickable}), a vertical Scrollbar that is linked
+    to the same flickable surface as the Header behaves as described below:
+
+    \list
+    \li - when the Header is exposed, the Scrollbar component sits right below it, \
+          thus avoiding overlaps;
+
+    \li - when the Header hides due to the user either flicking the surface or dragging \
+          the thumb, the trough of the Scrollbar does not resize or move, thus avoiding \
+          unexpected changes in thumb's position or size. As a side effect, the space \
+          above the Scrollbar, previously occupied by Header, stays empty until the Header \
+          is exposed again.
+
+    \endlist
+    \br
+    This behaviour is intended and makes for a less confusing User Experience.
   */
 
 Toolkit.StyledItem {
@@ -126,18 +168,26 @@
     //interactive scrollbar right below us (can happen with nested views)
     enabled: __interactive//&& __alwaysOnScrollbars
 
-    implicitWidth: internals.vertical ? units.gu(3) : flickableItem.width
-    implicitHeight: !internals.vertical ? units.gu(3) : flickableItem.height
+    implicitWidth: internals.vertical ? units.gu(3) : (flickableItem ? flickableItem.width : 0)
+    implicitHeight: !internals.vertical ? units.gu(3) : (flickableItem ? flickableItem.height : 0)
 
     anchors {
-        left: internals.leftAnchor(__viewport ? __viewport : flickableItem)
+        left: (__viewport || flickableItem)
+              ? internals.leftAnchor(__viewport ? __viewport : flickableItem)
+              : undefined
         leftMargin: internals.leftAnchorMargin()
-        right: internals.rightAnchor(__viewport ? __viewport : flickableItem)
+        right: (__viewport || flickableItem)
+               ? internals.rightAnchor(__viewport ? __viewport : flickableItem)
+               : undefined
         rightMargin: internals.rightAnchorMargin()
-        top: internals.topAnchor(__viewport ? __viewport : flickableItem)
-        topMargin: internals.topAnchorMargin()
-        bottom: internals.bottomAnchor(__viewport ? __viewport : flickableItem)
-        bottomMargin: internals.bottomAnchorMargin()
+        top: (__viewport || flickableItem)
+             ? internals.topAnchor(__viewport ? __viewport : flickableItem)
+             : undefined
+        topMargin: (flickableItem ? flickableItem.topMargin : 0) + internals.topAnchorMargin()
+        bottom: (__viewport || flickableItem)
+                ? internals.bottomAnchor(__viewport ? __viewport : flickableItem)
+                : undefined
+        bottomMargin: (flickableItem ? flickableItem.bottomMargin : 0) + internals.bottomAnchorMargin()
     }
 
     /*!
@@ -183,7 +233,6 @@
                         && __buddyScrollbar.align === Qt.AlignLeading
                         && __buddyScrollbar.__styleInstance.isScrollable)
                     return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
-                    //return buddyScrollbar.__styleInstance.indicatorThickness
                 // *ELSE FALLTHROUGH*
             default:
                 return 0
@@ -209,7 +258,6 @@
                         && __buddyScrollbar.align === Qt.AlignTrailing
                         && __buddyScrollbar.__styleInstance.isScrollable)
                     return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
-                    //return buddyScrollbar.__styleInstance.indicatorThickness
                 // *ELSE FALLTHROUGH*
             default:
                 return 0
@@ -234,7 +282,6 @@
                         && __buddyScrollbar.align === Qt.AlignTop
                         && __buddyScrollbar.__styleInstance.isScrollable)
                     return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
-                    //return buddyScrollbar.__styleInstance.indicatorThickness
                 // *ELSE FALLTHROUGH*
 
             default:
@@ -260,7 +307,6 @@
                         && __buddyScrollbar.align === Qt.AlignBottom
                         && __buddyScrollbar.__styleInstance.isScrollable)
                     return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
-                    //return buddyScrollbar.__styleInstance.indicatorThickness
                 // *ELSE FALLTHROUGH*
             default:
                 return 0

=== modified file 'src/Ubuntu/Components/Pickers/1.2/DatePicker.qml'
--- src/Ubuntu/Components/Pickers/1.2/DatePicker.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/Pickers/1.2/DatePicker.qml	2016-04-04 04:42:19 +0000
@@ -98,10 +98,10 @@
     \a minimum and \a maximum properties. The interval can be altered considering
     the following rules:
     \list
-        \li - \a minimum must be less or equal than the \l date; if the \a date
+        \li \a minimum must be less or equal than the \l date; if the \a date
                 value is less than the given \a minimum, the date will be set to
                 the minimum's value
-        \li - \a maximum value must be greater than the \a minimum, or invalid.
+        \li \a maximum value must be greater than the \a minimum, or invalid.
                 When the maximum is smaller than the \l date, the \l date property
                 will be updated to get the maximum value.
                 When set to invalid date (see Date.getInvalidDate()), the upper
@@ -142,12 +142,12 @@
     The date picker consist of three pickers: year, month, and date. The exact
     contents of the month and date pickers depends on the available width:
     \list
-        \li * full name for month, number and full day for date (“August” “28 Wednesday”)
-        \li * otherwise full name for month, number and abbreviated day
+        \li full name for month, number and full day for date (“August” “28 Wednesday”)
+        \li otherwise full name for month, number and abbreviated day
             for date (“August” “28 Wed”);
-        \li * otherwise full name for month, number for date (“August” “28”);
-        \li * otherwise abbreviated name for month, number for date (“Aug” “28”).
-        \li * otherwise number for month, number for date (“08” “28”).
+        \li otherwise full name for month, number for date (“August” “28”);
+        \li otherwise abbreviated name for month, number for date (“Aug” “28”).
+        \li otherwise number for month, number for date (“08” “28”).
     \endlist
 
     \a{If the currently selected date becomes impossible due to year change (from a

=== modified file 'src/Ubuntu/Components/Pickers/1.3/DatePicker.qml'
--- src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2016-04-04 04:42:19 +0000
@@ -98,10 +98,10 @@
     \a minimum and \a maximum properties. The interval can be altered considering
     the following rules:
     \list
-        \li - \a minimum must be less or equal than the \l date; if the \a date
+        \li \a minimum must be less or equal than the \l date; if the \a date
                 value is less than the given \a minimum, the date will be set to
                 the minimum's value
-        \li - \a maximum value must be greater than the \a minimum, or invalid.
+        \li \a maximum value must be greater than the \a minimum, or invalid.
                 When the maximum is smaller than the \l date, the \l date property
                 will be updated to get the maximum value.
                 When set to invalid date (see Date.getInvalidDate()), the upper
@@ -142,12 +142,12 @@
     The date picker consist of three pickers: year, month, and date. The exact
     contents of the month and date pickers depends on the available width:
     \list
-        \li * full name for month, number and full day for date (“August” “28 Wednesday”)
-        \li * otherwise full name for month, number and abbreviated day
+        \li full name for month, number and full day for date (“August” “28 Wednesday”)
+        \li otherwise full name for month, number and abbreviated day
             for date (“August” “28 Wed”);
-        \li * otherwise full name for month, number for date (“August” “28”);
-        \li * otherwise abbreviated name for month, number for date (“Aug” “28”).
-        \li * otherwise number for month, number for date (“08” “28”).
+        \li otherwise full name for month, number for date (“August” “28”);
+        \li otherwise abbreviated name for month, number for date (“Aug” “28”).
+        \li otherwise number for month, number for date (“08” “28”).
     \endlist
 
     \a{If the currently selected date becomes impossible due to year change (from a

=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2016-02-03 01:27:02 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2016-04-04 04:42:19 +0000
@@ -137,6 +137,68 @@
       */
     property alias contentHeight: foreground.height
 
+    /*!
+      \qmlproperty ThemeSettings theme
+      \since Ubuntu.Components 1.3
+      Configure the theme of the Dialog foreground and all its subcomponents.
+      Example:
+      \qml
+        import QtQuick 2.4
+        import Ubuntu.Components 1.3
+        import Ubuntu.Components.Popups 1.3
+        MainView {
+            width: units.gu(40)
+            height: units.gu(71)
+
+            // make sure the main theme is Ambiance
+            theme.name: "Ubuntu.Components.Themes.Ambiance"
+
+            Component {
+                id: dialogComponent
+                Dialog {
+                    id: dialog
+                    title: "Input dialog"
+                    // the dialog and its children will use SuruDark
+                    theme: ThemeSettings {
+                        name: "Ubuntu.Components.Themes.SuruDark"
+                    }
+                    TextField {
+                        placeholderText: "enter text"
+                    }
+                    Button {
+                        text: "Close"
+                        onClicked: PopupUtils.close(dialog)
+                    }
+                }
+            }
+
+            Button {
+                text: "Open dialog"
+                onClicked: PopupUtils.open(dialogComponent)
+            }
+        }
+      \endqml
+      \sa StyledItem::theme
+     */
+    property alias theme: foreground.theme
+
+    /*!
+      \qmlproperty string styleName
+      The style name of the foreground of the Dialog.
+      \since Ubuntu.Components 1.3
+      \sa StyledItem::styleName
+     */
+    property alias styleName: foreground.styleName
+
+    /*!
+      \qmlproperty Component style
+      The style of the foreground of the Dialog.
+      This property takes precedence over \l styleName
+      \since Ubuntu.Components 1.3
+      \sa StyledItem::style
+     */
+    property alias style: foreground.style
+
     __foreground: foreground
     __eventGrabber.enabled: modal
     __dimBackground: modal

=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-12-22 14:42:59 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2016-04-04 04:42:19 +0000
@@ -205,6 +205,30 @@
 
     y: parent ? (parent.height - height) / 2 : 0
 
+    /*!
+      \qmlproperty ThemeSettings theme
+      \since Ubuntu.Components 1.3
+      Configure the theme of the Popover foreground and all its subcomponents.
+      \sa StyledItem::theme, Dialog::theme
+     */
+    property alias theme: foreground.theme
+
+    /*!
+      \qmlproperty string styleName
+      The style name of the foreground of the Popover.
+      \since Ubuntu.Components 1.3
+      \sa StyledItem::styleName
+     */
+    property alias styleName: foreground.styleName
+
+    /*!
+      \qmlproperty Component style
+      The style of the foreground of the Popover.
+      This property takes precedence over \l styleName
+      \since Ubuntu.Components 1.3
+      \sa StyledItem::style
+     */
+    property alias style: foreground.style
     StyledItem {
         id: foreground
         objectName: "popover_foreground"

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-01-27 15:17:56 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-04-04 04:42:19 +0000
@@ -104,14 +104,17 @@
 
     Icon {
         id: h1
-        width: units.gu(2)
-        height: width
+        width: units.gu(3)
+        height: units.gu(1.5)
         anchors {
             centerIn: parent
             topMargin: styledItem.height
         }
         name: "toolkit_bottom-edge-hint"
         color: foregroundColor
+
+        FocusShape {
+        }
     }
 
     Rectangle {
@@ -128,6 +131,17 @@
             anchors.top: parent.top
         }
 
+        FocusShape {
+            anchors {
+                fill: undefined
+                margins: 0
+                top: parent.top
+                bottom: parent.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
+            // icon, spacing, label, margin on either side
+            width: icon.width + units.gu(1) + label.width + units.gu(0.46) * 2
+        }
         Row {
             anchors {
                 top: parent.top

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-14 09:16:41 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2016-04-04 04:42:19 +0000
@@ -22,10 +22,12 @@
     //setup properties
     property BottomEdge bottomEdge: styledItem
     panel: panelItem
-    contentItem: loader.item
     panelAnimation: panelBehavior
     revealThreshold: bottomEdge.hint.height + units.gu(2)
 
+    //deprecated for now
+    contentItem: bottomEdge.contentItem
+
     // own styling properties
     property color backgroundColor: !panelItem.collapsing
                                     ? Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
@@ -54,7 +56,7 @@
                        ? -(bottomEdge.height * bottomEdge.dragProgress)
                        : 0
         }
-        height: loader.item ? loader.item.height : 0
+        height: bottomEdge.contentItem ? bottomEdge.contentItem.height : 0
         color: panelColor
         opacity: bottomEdge.status >= BottomEdge.Revealed ? 1.0 : 0.0
 
@@ -108,26 +110,5 @@
                 GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.1) }
             }
         }
-
-        // content
-        Loader {
-            id: loader
-            anchors.horizontalCenter: parent.horizontalCenter
-            asynchronous: true
-            source: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentUrl : ""
-            sourceComponent: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentComponent : null
-            onItemChanged: {
-                if (item) {
-                    item.parent = panelItem;
-                    item.anchors.horizontalCenter = panelItem.horizontalCenter;
-                }
-            }
-
-            Connections {
-                target: bottomEdge
-                onCommitStarted: loader.asynchronous = false
-                onCommitCompleted: loader.asynchronous = true
-            }
-        }
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2016-02-10 16:33:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2016-04-04 04:42:19 +0000
@@ -32,7 +32,7 @@
     /*!
       Highlight color.
       */
-    property color highlightColor: theme.palette.highlight.baseText
+    property color highlightColor: theme.palette.highlighted.baseText
     /*!
       Scale of the highlight item
       */

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2016-01-27 16:42:47 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2016-04-04 04:42:19 +0000
@@ -79,6 +79,7 @@
                         id: actionButton
                         action: modelData
                         enabled: action.enabled
+                        activeFocusOnTab: false
                         width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, actionsRow.minItemWidth, actionsRow.maxItemWidth)
                         anchors {
                             top: parent ? parent.top : undefined

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-01-27 15:17:56 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-04-04 04:42:19 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
+import QtQuick.Window 2.0
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.Styles 1.3 as Style
@@ -21,7 +22,7 @@
 Style.PageHeadStyle {
     id: headerStyle
     objectName: "PageHeadStyle" // used in unit tests
-    contentHeight: units.gu(6)
+    contentHeight: Screen.height > units.gu(50) ? units.gu(6) : units.gu(5)
     fontWeight: Font.Light
     textSize: Label.Large
     textLeftMargin: units.gu(2)

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-02-18 16:21:27 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2016-04-04 04:42:19 +0000
@@ -121,10 +121,18 @@
 
     //flickable helper properties
     property Flickable flickableItem: styledItem.flickableItem
-    property real pageSize: (isVertical) ? (styledItem.flickableItem.height) : (styledItem.flickableItem.width)
-    property real contentSize: (isVertical) ? styledItem.flickableItem.contentHeight : styledItem.flickableItem.contentWidth
-    property real leadingContentMargin: isVertical ? styledItem.flickableItem.topMargin : styledItem.flickableItem.leftMargin
-    property real trailingContentMargin: isVertical ? styledItem.flickableItem.bottomMargin : styledItem.flickableItem.rightMargin
+    property real pageSize: flickableItem
+                            ? (isVertical ? flickableItem.height : flickableItem.width)
+                            : 0
+    property real contentSize: flickableItem
+                               ? (isVertical ? flickableItem.contentHeight : flickableItem.contentWidth)
+                               : 0
+    property real leadingContentMargin: flickableItem
+                                        ? (isVertical ? flickableItem.topMargin : flickableItem.leftMargin)
+                                        : 0
+    property real trailingContentMargin: flickableItem
+                                         ? (isVertical ? flickableItem.bottomMargin : flickableItem.rightMargin)
+                                         : 0
     //this size includes content margins
     property real totalContentSize: contentSize + leadingContentMargin + trailingContentMargin
 
@@ -271,7 +279,7 @@
 
             //The total length of the path where the thumb can be positioned, from its min to its max value
             var draggableLength = scrollbar.__trough[propSize] - margin*2
-            var maxPosRatio = 1.0 - scrollbar.flickableItem.visibleArea[propSizeRatio]
+            var maxPosRatio = 1.0 - (scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propSizeRatio] : 1.0)
 
             //Example with x/width, same applies to y/height
             //xPosition is in the range [0...1 - widthRatio]
@@ -282,7 +290,7 @@
             //the maxPosition is reached when xPosition becomes 1, and that never happens. To compensate that, we
             //scale xPosition by ( 1 / ( 1 - widthRatio) ). This way, when xPosition reaches its max ( 1 - widthRatio )
             //we get a multiplication factor of 1
-            return MathUtils.clamp(1.0 / maxPosRatio * scrollbar.flickableItem.visibleArea[propPosRatio]
+            return MathUtils.clamp(1.0 / maxPosRatio * (scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propPosRatio] : 1.0)
                                    * (draggableLength - scrollbar.__styleInstance.thumb[propSize]) + margin, min, max);
         }
 
@@ -296,8 +304,8 @@
           THUMB CAN MOVE INTO! (which is what you want in 99.9% of the cases, for a scrollbar)
           */
         function sliderSize(scrollbar, min, max) {
-            var sizeRatio = scrollbar.flickableItem.visibleArea[propSizeRatio];
-            var posRatio = scrollbar.flickableItem.visibleArea[propPosRatio];
+            var sizeRatio = scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propSizeRatio] : 1.0;
+            var posRatio = scrollbar.flickableItem ? scrollbar.flickableItem.visibleArea[propPosRatio] : 0.0;
 
             //(sizeRatio * max) is the current ideal size, as recommended by Flickable visibleArea props
             var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-02-26 10:13:15 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-04-04 04:42:19 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
 import QtGraphicalEffects 1.0
 import Ubuntu.Components.Private 1.3
@@ -22,7 +23,7 @@
     id: sectionsStyle
 
     implicitWidth: sectionsListView.contentWidth + 2 * listViewContainer.listViewMargins
-    implicitHeight: units.gu(4)
+    implicitHeight: Screen.height > units.gu(50) ? units.gu(4) : units.gu(3)
 
     /*!
       The foreground color of unselected sections.
@@ -208,7 +209,7 @@
                     font.weight: Font.Light
                     anchors {
                         baseline: underline.bottom
-                        baselineOffset: -units.gu(2)
+                        baselineOffset: sectionsStyle.height < units.gu(4) ? -units.gu(1) : -units.gu(2)
                         horizontalCenter: parent.horizontalCenter
                     }
 
@@ -235,6 +236,7 @@
             }
 
             SmoothedAnimation {
+                objectName: "sections_scroll_animation"
                 id: contentXAnim
                 target: sectionsListView
                 property: "contentX"
@@ -250,53 +252,52 @@
 
         property real iconsDisabledOpacity: 0.3
 
-        property bool hoveringLeft: false
-        property bool hoveringRight: false
-
-        function checkHovering(mouse) {
-            if (mouse.x < listViewContainer.listViewMargins) {
-                if (!hoveringLeft) hoveringLeft = true;
-            } else if (mouse.x > width - listViewContainer.listViewMargins) {
-                if (!hoveringRight) hoveringRight = true;
-            } else {
-                hoveringLeft = false;
-                hoveringRight = false;
-            }
-        }
-
         anchors.fill: parent
         hoverEnabled: true
 
-        onPositionChanged: checkHovering(mouse)
-        onExited: {
-            hoveringLeft = false;
-            hoveringRight = false;
-        }
+        property bool pressedLeft: false
+        property bool pressedRight: false
         onPressed: {
-            if (!hoveringLeft && !hoveringRight) {
-                mouse.accepted = false;
-            }
+            pressedLeft = leftIcon.contains(mouse);
+            pressedRight = rightIcon.contains(mouse);
+            mouse.accepted = pressedLeft || pressedRight;
         }
         onClicked: {
             // positionViewAtIndex() does not provide animation
+            var scrollDirection = 0;
+            if (pressedLeft && leftIcon.contains(mouse)) {
+                scrollDirection = -1;
+            } else if (pressedRight && rightIcon.contains(mouse)) {
+                scrollDirection = 1;
+            } else {
+                // User pressed on the left or right icon, and then released inside of the
+                // MouseArea but outside of the icon that was pressed.
+                return;
+            }
             if (contentXAnim.running) contentXAnim.stop();
-            var newContentX = sectionsListView.contentX + (sectionsListView.width * (hoveringLeft ? -1 : 1));
+            var newContentX = sectionsListView.contentX + (sectionsListView.width * scrollDirection);
             contentXAnim.from = sectionsListView.contentX;
             // make sure we don't overshoot bounds
             contentXAnim.to = MathUtils.clamp(
                         newContentX,
-                        sectionsListView.originX,
+                        0.0, // estimation of originX is some times wrong when scrolling towards the beginning
                         sectionsListView.originX + sectionsListView.contentWidth - sectionsListView.width);
             contentXAnim.start();
         }
 
         Icon {
-            id: leftHoveringIcon
+            id: leftIcon
+            objectName: "left_scroll_icon"
+            // return whether the pressed event was done inside the area of the icon
+            function contains(mouse) {
+                return (mouse.x < listViewContainer.listViewMargins &&
+                        !sectionsListView.atXBeginning);
+            }
             anchors {
                 left: parent.left
                 leftMargin: (listViewContainer.listViewMargins - width) / 2
                 bottom: parent.bottom
-                bottomMargin: units.gu(2)
+                bottomMargin: sectionsStyle.height < units.gu(4) ? units.gu(1) : units.gu(2)
             }
             width: units.gu(1)
             height: units.gu(1)
@@ -314,12 +315,18 @@
         }
 
         Icon {
-            id: rightHoveringIcon
+            id: rightIcon
+            objectName: "right_scroll_icon"
+            // return whether the pressed event was done inside the area of the icon
+            function contains(mouse) {
+                return (mouse.x > (hoveringArea.width - listViewContainer.listViewMargins) &&
+                        !sectionsListView.atXEnd);
+            }
             anchors {
                 right: parent.right
                 rightMargin: (listViewContainer.listViewMargins - width) / 2
                 bottom: parent.bottom
-                bottomMargin: units.gu(2)
+                bottomMargin: sectionsStyle.height < units.gu(4) ? units.gu(1) : units.gu(2)
             }
             width: units.gu(1)
             height: units.gu(1)
@@ -386,8 +393,8 @@
             when: hoveringArea.containsMouse
             PropertyChanges { target: mask; visible: true }
             PropertyChanges { target: listViewContainer; opacity: 0.0 }
-            PropertyChanges { target: leftHoveringIcon; visible: true; }
-            PropertyChanges { target: rightHoveringIcon; visible: true; }
+            PropertyChanges { target: leftIcon; visible: true; }
+            PropertyChanges { target: rightIcon; visible: true; }
         }
     ]
 }

=== added file 'src/Ubuntu/Components/plugin/label_p.h'
--- src/Ubuntu/Components/plugin/label_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/label_p.h	2016-04-04 04:42:19 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+#ifndef LABEL_P
+#define LABEL_P
+
+#include "uclabel.h"
+
+class UCLabelPrivate
+{
+    Q_DECLARE_PUBLIC(UCLabel)
+public:
+    explicit UCLabelPrivate(UCLabel *qq);
+    UCLabelPrivate(UCLabel *qq, UCLabel::ColorProviderFunc func);
+
+    static UCLabelPrivate *get(UCLabel *q)
+    {
+        return q->d_func();
+    }
+
+    void init();
+
+    // slots
+    void updateRenderType();
+
+    // methods
+    void updatePixelSize();
+
+    // members
+    enum {
+        TextSizeSet = 1,
+        PixelSizeSet = 2,
+        ColorSet = 4
+    };
+
+    UCLabel *q_ptr;
+    QFont defaultFont;
+    UCLabel::ColorProviderFunc defaultColor;
+    UCLabel::TextSize textSize;
+    quint8 flags;
+
+protected:
+    static QColor getDefaultColor(QQuickItem *item, UCTheme *theme);
+};
+
+#endif // LABEL_P
+

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-02-10 18:02:18 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-04-04 04:42:19 +0000
@@ -110,11 +110,14 @@
     $$PWD/ucmainviewbase.h \
     $$PWD/ucmainviewbase_p.h \
     $$PWD/ucperformancemonitor.h \
+    $$PWD/privates/listviewextensions.h \
     $$PWD/privates/frame.h \
     $$PWD/privates/ucpagewrapper.h \
     $$PWD/privates/ucpagewrapper_p.h \
     $$PWD/privates/ucpagewrapperincubator_p.h \
-    $$PWD/privates/appheaderbase.h
+    $$PWD/privates/appheaderbase.h \
+    $$PWD/label_p.h \
+    $$PWD/ucbottomedgeregion_p.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -187,6 +190,7 @@
     $$PWD/ucpagetreenode.cpp \
     $$PWD/ucmainviewbase.cpp \
     $$PWD/ucperformancemonitor.cpp \
+    $$PWD/privates/listviewextensions.cpp \
     $$PWD/privates/frame.cpp \
     $$PWD/privates/ucpagewrapper.cpp \
     $$PWD/privates/ucpagewrapperincubator.cpp \

=== added file 'src/Ubuntu/Components/plugin/privates/listviewextensions.cpp'
--- src/Ubuntu/Components/plugin/privates/listviewextensions.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/privates/listviewextensions.cpp	2016-04-04 04:42:19 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author Zsombor Egri <[e-mail]>
+ */
+
+#include "listviewextensions.h"
+#include "uclistitem_p.h"
+#include "quickutils.h"
+#include <QtQuick/QQuickItem>
+#include <QtQuick/private/qquickflickable_p.h>
+
+ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent)
+    : QObject(parent)
+    , listView(listView)
+{
+}
+ListViewProxy::~ListViewProxy()
+{
+    if (isEventFilter) {
+        listView->removeEventFilter(this);
+    }
+}
+
+// proxy methods
+
+Qt::Orientation ListViewProxy::orientation()
+{
+    return (Qt::Orientation)listView->property("orientation").toInt();
+}
+
+int ListViewProxy::count()
+{
+    return listView->property("count").toInt();
+}
+
+QQuickItem *ListViewProxy::currentItem()
+{
+    return listView->property("currentItem").value<QQuickItem*>();
+}
+
+int ListViewProxy::currentIndex()
+{
+    return listView->property("currentIndex").toInt();
+}
+
+void ListViewProxy::setCurrentIndex(int index)
+{
+    listView->setProperty("currentIndex", index);
+}
+
+QVariant ListViewProxy::model()
+{
+    return listView->property("model");
+}
+
+/*********************************************************************
+ * Additional functionality used in different places in toolkit
+ *********************************************************************/
+
+// Navigation override used by ListItems
+void ListViewProxy::overrideItemNavigation(bool override)
+{
+    if (override) {
+        listView->installEventFilter(this);
+    } else {
+        listView->removeEventFilter(this);
+    }
+    isEventFilter = override;
+}
+
+bool ListViewProxy::eventFilter(QObject *, QEvent *event)
+{
+    switch (event->type()) {
+        case QEvent::FocusIn:
+            return focusInEvent(static_cast<QFocusEvent*>(event));
+        case QEvent::KeyPress:
+            return keyPressEvent(static_cast<QKeyEvent*>(event));
+        default:
+            break;
+    }
+
+    return false;
+}
+
+void ListViewProxy::setKeyNavigationForListView(bool value)
+{
+    UCListItem *listItem = qobject_cast<UCListItem*>(currentItem());
+    if (listItem) {
+        UCListItemPrivate::get(listItem)->setListViewKeyNavigation(value);
+        listItem->update();
+    }
+}
+
+// grab focusIn event
+bool ListViewProxy::focusInEvent(QFocusEvent *event)
+{
+    switch (event->reason()) {
+        case Qt::TabFocusReason:
+        case Qt::BacktabFocusReason:
+        {
+            QQuickItem *currentItem = this->currentItem();
+            if (!currentItem && count() > 0) {
+                // set the first one to be the focus
+                setCurrentIndex(0);
+                setKeyNavigationForListView(true);
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
+
+// override up/down key presses for ListView; returns true if the key event is consumed
+// in which case ListView won't get it.
+bool ListViewProxy::keyPressEvent(QKeyEvent *event)
+{
+    int key = event->key();
+    Qt::Orientation orientation = this->orientation();
+
+    if ((orientation == Qt::Vertical && key != Qt::Key_Up && key != Qt::Key_Down)
+        || (orientation == Qt::Horizontal && key != Qt::Key_Left && key != Qt::Key_Right)) {
+        return false;
+    }
+    // for horizontal moves take into account the layout mirroring
+    bool isRtl = QQuickItemPrivate::get(listView)->effectiveLayoutMirror;
+    bool forwards = (key == Qt::Key_Up || (isRtl ? key == Qt::Key_Left : key == Qt::Key_Right));
+    int oldIndex = this->currentIndex();
+    int currentIndex = this->currentIndex();
+    int count = this->count();
+
+    if (currentIndex >= 0 && count > 0) {
+        currentIndex = qBound<int>(0, forwards ? currentIndex - 1 : currentIndex + 1, count - 1);
+        setCurrentIndex(currentIndex);
+        setKeyNavigationForListView(true);
+    }
+
+    return (oldIndex != currentIndex);
+}

=== added file 'src/Ubuntu/Components/plugin/privates/listviewextensions.h'
--- src/Ubuntu/Components/plugin/privates/listviewextensions.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/privates/listviewextensions.h	2016-04-04 04:42:19 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author Zsombor Egri <[e-mail]>
+ */
+
+#ifndef LISTVIEWEXTENSIONS_H
+#define LISTVIEWEXTENSIONS_H
+
+#include <QtCore/QObject>
+
+class QQuickFlickable;
+class QQuickItem;
+class QFocusEvent;
+class QKeyEvent;
+class ListViewProxy : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ListViewProxy(QQuickFlickable *listView, QObject *parent = 0);
+    virtual ~ListViewProxy();
+    inline QQuickFlickable *view() const
+    {
+        return listView;
+    }
+    void overrideItemNavigation(bool override);
+
+
+    // proxied methods
+    Qt::Orientation orientation();
+    int count();
+    QQuickItem *currentItem();
+    int currentIndex();
+    void setCurrentIndex(int index);
+    QVariant model();
+
+protected:
+    bool eventFilter(QObject *, QEvent *) override;
+
+    bool focusInEvent(QFocusEvent *event);
+    bool keyPressEvent(QKeyEvent *event);
+    void setKeyNavigationForListView(bool value);
+private:
+    QQuickFlickable *listView;
+    bool isEventFilter:1;
+};
+
+#endif // LISTVIEWEXTENSIONS_H

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-01-30 10:51:22 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-04-04 04:42:19 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 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
@@ -15,7 +15,7 @@
  */
 
 #include "threelabelsslot_p.h"
-#include "uclabel.h"
+#include "label_p.h"
 #include "ucunits.h"
 #include "ucfontutils.h"
 #include "uctheme.h"
@@ -148,7 +148,7 @@
     if (d->m_title == Q_NULLPTR) {
         d->m_title = new UCLabel(this);
         QQmlEngine::setContextForObject(d->m_title, qmlContext(this));
-        d->m_title->init();
+        UCLabelPrivate::get(d->m_title)->init();
 
         QQuickAnchors *titleAnchors = QQuickItemPrivate::get(d->m_title)->anchors();
         titleAnchors->setLeft(d->left());
@@ -193,7 +193,7 @@
     if (d->m_subtitle == Q_NULLPTR) {
         d->m_subtitle = new UCLabel(getSubtitleColor, this);
         QQmlEngine::setContextForObject(d->m_subtitle, qmlContext(this));
-        d->m_subtitle->init();
+        UCLabelPrivate::get(d->m_subtitle)->init();
 
         QQuickAnchors *subtitleAnchors = QQuickItemPrivate::get(d->m_subtitle)->anchors();
         subtitleAnchors->setLeft(d->left());
@@ -223,7 +223,7 @@
     if (d->m_summary == Q_NULLPTR) {
         d->m_summary = new UCLabel(getSummaryColor, this);
         QQmlEngine::setContextForObject(d->m_summary, qmlContext(this));
-        d->m_summary->init();
+        UCLabelPrivate::get(d->m_summary)->init();
 
         QQuickAnchors *summaryAnchors = QQuickItemPrivate::get(d->m_summary)->anchors();
         summaryAnchors->setLeft(d->left());

=== modified file 'src/Ubuntu/Components/plugin/propertychange_p.cpp'
--- src/Ubuntu/Components/plugin/propertychange_p.cpp	2015-06-07 13:20:11 +0000
+++ src/Ubuntu/Components/plugin/propertychange_p.cpp	2016-04-04 04:42:19 +0000
@@ -42,7 +42,12 @@
 void PropertyChange::backup()
 {
     if (!backedUp) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        backupBinding = QQmlPropertyPrivate::binding(qmlProperty);
+        QQmlPropertyPrivate::setBinding(qmlProperty, Q_NULLPTR);
+#else
         backupBinding = QQmlPropertyPrivate::setBinding(qmlProperty, Q_NULLPTR);
+#endif
         backupValue = qmlProperty.read();
         backedUp = true;
     }
@@ -70,9 +75,18 @@
        return;
    }
    change->backup();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+   QQmlAbstractBinding::Ptr prev(QQmlPropertyPrivate::binding(change->qmlProperty));
+   QQmlPropertyPrivate::setBinding(change->qmlProperty, binding);
+#else
    QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, binding);
+#endif
    if (prev && prev != binding && prev != change->backupBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+       prev->removeFromObject();
+#else
        prev->destroy();
+#endif
    }
 }
 
@@ -88,9 +102,18 @@
     if (change->backedUp) {
         if (change->qmlProperty.isValid()) {
             if (change->backupBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                QQmlAbstractBinding::Ptr prev(QQmlPropertyPrivate::binding(change->qmlProperty));
+                QQmlPropertyPrivate::setBinding(change->qmlProperty, change->backupBinding.data());
+#else
                 QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, change->backupBinding);
+#endif
                 if (prev != change->backupBinding && prev) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                    prev->removeFromObject();
+#else
                     prev->destroy();
+#endif
                 }
             } else {
                 change->qmlProperty.write(change->backupValue);

=== modified file 'src/Ubuntu/Components/plugin/propertychange_p.h'
--- src/Ubuntu/Components/plugin/propertychange_p.h	2015-05-29 06:09:56 +0000
+++ src/Ubuntu/Components/plugin/propertychange_p.h	2016-04-04 04:42:19 +0000
@@ -21,6 +21,10 @@
 #include <QtCore/QObject>
 #include <QtQml/QQmlProperty>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#include <QtCore/QExplicitlySharedDataPointer>
+#endif
+
 class QQmlAbstractBinding;
 class PropertyChange
 {
@@ -41,7 +45,12 @@
     bool backedUp;
     QQmlProperty qmlProperty;
     QVariant backupValue;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    QExplicitlySharedDataPointer<QQmlAbstractBinding> backupBinding;
+#else
     QQmlAbstractBinding *backupBinding;
+#endif
 
     void backup();
 };

=== modified file 'src/Ubuntu/Components/plugin/quickutils.cpp'
--- src/Ubuntu/Components/plugin/quickutils.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/quickutils.cpp	2016-04-04 04:42:19 +0000
@@ -214,3 +214,56 @@
     }
     return showWarnings == 2;
 }
+
+// check whether an item is a descendant of parent
+bool QuickUtils::descendantItemOf(QQuickItem *item, const QQuickItem *parent)
+{
+    while (item && parent) {
+        if (item == parent) {
+            return true;
+        }
+        item = item->parentItem();
+    }
+    return false;
+}
+
+// returns the first key-focusable child item
+QQuickItem *QuickUtils::firstFocusableChild(QQuickItem *item)
+{
+    if (!item) {
+        return Q_NULLPTR;
+    }
+    const QList<QQuickItem*> &list = item->childItems();
+    for (int i = 0; i < list.count(); i++) {
+        QQuickItem *child = list.at(i);
+        if (child->activeFocusOnTab()) {
+            return child;
+        }
+        QQuickItem *focus = firstFocusableChild(child);
+        if (focus) {
+            return focus;
+        }
+    }
+    return Q_NULLPTR;
+}
+
+// returns the last key-focusable child item
+QQuickItem *QuickUtils::lastFocusableChild(QQuickItem *item)
+{
+    if (!item) {
+        return Q_NULLPTR;
+    }
+    const QList<QQuickItem*> &list = item->childItems();
+    int i = list.count() - 1;
+    while (i >= 0) {
+        QQuickItem *child = list.at(i--);
+        if (child->activeFocusOnTab()) {
+            return child;
+        }
+        QQuickItem *focus = lastFocusableChild(child);
+        if (focus) {
+            return focus;
+        }
+    }
+    return Q_NULLPTR;
+}

=== modified file 'src/Ubuntu/Components/plugin/quickutils.h'
--- src/Ubuntu/Components/plugin/quickutils.h	2016-02-10 09:54:59 +0000
+++ src/Ubuntu/Components/plugin/quickutils.h	2016-04-04 04:42:19 +0000
@@ -55,6 +55,9 @@
     Q_REVISION(1) Q_INVOKABLE static bool inherits(QObject *object, const QString &fromClass);
     QObject* createQmlObject(const QUrl &url, QQmlEngine *engine);
     static bool showDeprecationWarnings();
+    static bool descendantItemOf(QQuickItem *item, const QQuickItem *parent);
+    Q_INVOKABLE static QQuickItem *firstFocusableChild(QQuickItem *item);
+    Q_INVOKABLE static QQuickItem *lastFocusableChild(QQuickItem *item);
 
     bool mouseAttached()
     {

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-01-25 12:23:03 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-04-04 04:42:19 +0000
@@ -19,6 +19,7 @@
 #include "ucbottomedge_p.h"
 #include "ucbottomedgestyle.h"
 #include "ucbottomedgeregion.h"
+#include "ucbottomedgeregion_p.h"
 #include "ucbottomedgehint_p.h"
 #include "ucstyleditembase_p.h"
 #include <QtQml/QQmlEngine>
@@ -37,15 +38,15 @@
 #include "private/ucswipearea_p.h"
 #include <QtQuick/private/qquickanimation_p.h>
 
+using namespace UbuntuToolkit;
+
 Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)
 
-#define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
-
 UCBottomEdgePrivate::UCBottomEdgePrivate()
     : UCStyledItemBasePrivate()
+    , defaultRegion(new DefaultRegion(nullptr))
     , activeRegion(Q_NULLPTR)
     , hint(new UCBottomEdgeHint)
-    , contentComponent(Q_NULLPTR)
     , bottomPanel(Q_NULLPTR)
     , previousDistance(0.0)
     , dragProgress(0.)
@@ -54,6 +55,7 @@
     , dragDirection(UCBottomEdge::Undefined)
     , defaultRegionsReset(false)
     , mousePressed(false)
+    , preloadContent(false)
 {
 }
 
@@ -67,8 +69,16 @@
         hint->setEnabled2(q->isEnabled());
     });
 
-    // create default regions
-    createDefaultRegions();
+    // create default region
+    // enters in this stage when drag ratio reaches 30% of the area
+    UCBottomEdgeRegionPrivate::get(defaultRegion)->attachToBottomEdge(q);
+
+    QObject::connect(defaultRegion, &UCBottomEdgeRegion::contentChanged,
+                     q, &UCBottomEdge::contentChanged);
+    QObject::connect(defaultRegion, &UCBottomEdgeRegion::contentComponentChanged,
+                     q, &UCBottomEdge::contentComponentChanged);
+
+    regions.append(defaultRegion);
 
     // set the style name
     styleDocument = QStringLiteral("BottomEdgeStyle");
@@ -120,11 +130,10 @@
     QQml_setParent_noEvent(region, q);
     // take ownership!
     QQmlEngine::setObjectOwnership(region, QQmlEngine::CppOwnership);
-    region->attachToBottomEdge(q);
+    UCBottomEdgeRegionPrivate::get(region)->attachToBottomEdge(q);
 
     if (!defaultRegionsReset) {
         defaultRegionsReset = true;
-        qDeleteAll(regions);
         regions.clear();
     }
 
@@ -133,6 +142,8 @@
 
     // append region definition
     regions.append(region);
+
+    LOG << "region added:" << region;
 }
 
 // clears the custom regions list and restores the default ones
@@ -146,7 +157,9 @@
     }
     regions.clear();
     defaultRegionsReset = false;
-    createDefaultRegions();
+    regions.append(defaultRegion);
+
+    LOG << "regions cleared, default restored";
 }
 
 // validates an added region
@@ -155,7 +168,7 @@
     // we should not validate unti the bottom edge is not completed,
     // property changes may invalidate the result of the validation
     // also leave if the region is disabled
-    if (!componentComplete || !region->m_enabled) {
+    if (!componentComplete || !UCBottomEdgeRegionPrivate::get(region)->enabled) {
         return;
     }
     Q_Q(UCBottomEdge);
@@ -170,7 +183,7 @@
     const QRectF regionRect(region->rect(boundingRect));
     for (int i = 0; i < regionsSize; ++i) {
         UCBottomEdgeRegion *stackedRegion = regions[i];
-        if (region == stackedRegion || !stackedRegion->m_enabled) {
+        if (region == stackedRegion || !UCBottomEdgeRegionPrivate::get(stackedRegion)->enabled) {
             continue;
         }
         QRectF rect(stackedRegion->rect(boundingRect));
@@ -180,27 +193,14 @@
             QRectF intersect = regionRect.intersected(stackedRegion->rect(boundingRect));
             if (!intersect.isNull()) {
                 qmlInfo(region) << QString("Region intersects the one from index %1 having from: %2 and to: %3")
-                                   .arg(i).arg(stackedRegion->m_from).arg(stackedRegion->m_to);
+                                   .arg(i)
+                                   .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->from)
+                                   .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->to);
             }
         }
     }
 }
 
-// creates the default region(s)
-void UCBottomEdgePrivate::createDefaultRegions()
-{
-    Q_Q(UCBottomEdge);
-    // add the default stages
-    UCBottomEdgeRegion *commitRegion = new UCBottomEdgeRegion(q);
-    // for testing purposes
-    commitRegion->setObjectName("default_BottomEdgeRegion");
-    // enters in this stage when drag ratio reaches 30% of the area
-    commitRegion->m_from = 0.33;
-    commitRegion->m_to = 1.0;
-
-    regions.append(commitRegion);
-}
-
 // update status, drag direction and activeRegion during drag
 void UCBottomEdgePrivate::updateProgressionStates(qreal distance)
 {
@@ -227,6 +227,11 @@
             break;
         }
     }
+    // if no active region is found, use the default one
+    if (!newActive) {
+        LOG << "no active region found, fall back to the default";
+        newActive = defaultRegion;
+    }
     if (newActive != activeRegion) {
         setActiveRegion(newActive);
     }
@@ -286,15 +291,15 @@
 void UCBottomEdgePrivate::onDragEnded()
 {
     // collapse if we drag downwards, or not in any active region and we did not pass 30% of the BottomEdge height
-    if (dragDirection == UCBottomEdge::Downwards || (!activeRegion && dragProgress < 0.33)) {
+    LOG << "direction:" << dragDirection << ", activeRegion?" << activeRegion << ", dragProgress:" << dragProgress;
+    if (dragDirection == UCBottomEdge::Downwards || (activeRegion && !activeRegion->canCommit(dragProgress))) {
         q_func()->collapse();
-    } else if (!activeRegion && dragProgress >= 0.33) {
-        // commit if we are not in an active region but we passed 30% of the BottomEdge height
-        q_func()->commit();
-    } else if (activeRegion) {
-        // emit region's dragEnded first
-        Q_EMIT activeRegion->dragEnded();
-        commit(activeRegion->m_to);
+    } else {
+        UCBottomEdgeRegion *region = activeRegion ? activeRegion : defaultRegion;
+        if (region->canCommit(dragProgress)) {
+            Q_EMIT region->dragEnded();
+            commit(UCBottomEdgeRegionPrivate::get(region)->to);
+        }
     }
 }
 
@@ -352,6 +357,8 @@
         }
         break;
     case UCBottomEdgePrivate::Collapsing:
+        // no active region when collapsed!
+        d->setActiveRegion(nullptr);
         d->setStatus(UCBottomEdge::Hidden);
         Q_EMIT collapseCompleted();
         break;
@@ -392,11 +399,12 @@
 void UCBottomEdgePrivate::patchContentItemHeader()
 {
     // ugly, as it can be, as we don't have the PageHeader in cpp to detect the type
-    UCHeader *header = bottomPanel->m_contentItem ? bottomPanel->m_contentItem->findChild<UCHeader*>() : Q_NULLPTR;
+    UCHeader *header = currentContentItem ? currentContentItem->findChild<UCHeader*>() : Q_NULLPTR;
     if (!header || !QuickUtils::inherits(header, "PageHeader")) {
         return;
     }
 
+    LOG << "PATCH HEADER" << currentContentItem.data();
     // get the navigationActions and inject an action there
     QVariant list(header->property("navigationActions"));
     QQmlListProperty<UCAction> actions = list.value< QQmlListProperty<UCAction> >();
@@ -434,7 +442,6 @@
 bool UCBottomEdgePrivate::loadStyleItem(bool animated)
 {
     // fix styleVersion
-    Q_Q(UCBottomEdge);
     if (!styleVersion) {
         styleVersion = BUILD_VERSION(1, 3);
     }
@@ -453,14 +460,6 @@
         hint->setParentItem(bottomPanel);
         // and stack it before the panel, so it is covered by the panel when revealed
         hint->stackBefore(bottomPanel->m_panel);
-
-        // connect style stuff
-        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged,
-                         q, &UCBottomEdge::contentItemChanged, Qt::DirectConnection);
-        // follow contentItem change to patch the header
-        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged, [=]() {
-            patchContentItemHeader();
-        });
     }
     return result;
 }
@@ -749,6 +748,7 @@
 {
     UCStyledItemBasePrivate::completeComponentInitialization();
     Q_Q(UCBottomEdge);
+
     // fix the hint's style version as that has no qmlContext of its own
     // and thus import version check will fail; setting the context for
     // the hint using this component's hint won't work either as this
@@ -830,6 +830,15 @@
         }
         break;
     }
+    case QEvent::KeyPress: {
+        QKeyEvent *keyPress = static_cast<QKeyEvent*>(event);
+        switch (keyPress->key()) {
+            case Qt::Key_Escape:
+                collapse();
+            default:
+                break;
+        }
+    }
     default: break;
     }
     return UCStyledItemBase::eventFilter(target, event);
@@ -931,6 +940,13 @@
     }
 
     Q_EMIT q_func()->statusChanged(this->status);
+
+    // show content
+    if (status > UCBottomEdge::Hidden) {
+        setCurrentContent();
+    } else {
+        resetCurrentContent(nullptr);
+    }
 }
 
 /*!
@@ -941,17 +957,12 @@
 QUrl UCBottomEdge::contentUrl() const
 {
     Q_D(const UCBottomEdge);
-    return d->contentUrl;
+    return d->defaultRegion->url();
 }
 void UCBottomEdge::setContent(const QUrl &url)
 {
     Q_D(UCBottomEdge);
-    if (d->contentUrl == url) {
-        return;
-    }
-
-    d->contentUrl = url;
-    Q_EMIT contentChanged(d->contentUrl);
+    d->defaultRegion->setUrl(url);
 }
 
 /*!
@@ -962,16 +973,12 @@
 QQmlComponent *UCBottomEdge::contentComponent() const
 {
     Q_D(const UCBottomEdge);
-    return d->contentComponent;
+    return d->defaultRegion->component();
 }
 void UCBottomEdge::setContentComponent(QQmlComponent *component)
 {
     Q_D(UCBottomEdge);
-    if (d->contentComponent == component) {
-        return;
-    }
-    d->contentComponent = component;
-    Q_EMIT contentComponentChanged(d->contentComponent);
+    d->defaultRegion->setComponent(component);
 }
 
 /*!
@@ -983,7 +990,7 @@
 QQuickItem *UCBottomEdge::contentItem() const
 {
     Q_D(const UCBottomEdge);
-    return d->bottomPanel ? d->bottomPanel->m_contentItem : Q_NULLPTR;
+    return d->currentContentItem.data();
 }
 
 /*!
@@ -995,6 +1002,11 @@
 void UCBottomEdge::commit()
 {
     Q_D(UCBottomEdge);
+    // make sure that teh default region's content is loaded!
+    if (!d->activeRegion || d->activeRegion == d->defaultRegion) {
+        // make sure teh default is the active region
+        d->setActiveRegion(d->defaultRegion);
+    }
     d->commit(1.0);
 }
 
@@ -1082,4 +1094,94 @@
     return d->activeRegion;
 }
 
+/*!
+ * \qmlproperty bool BottomEdge::preloadContent
+ * If set, all the contents set in the component and in regions will be loaded
+ * in the background, so it will be available before it is revealed.
+ */
+bool UCBottomEdge::preloadContent() const
+{
+    return d_func()->preloadContent;
+}
+void UCBottomEdge::setPreloadContent(bool value)
+{
+    Q_D(UCBottomEdge);
+    if (d->preloadContent == value) {
+        return;
+    }
+    d->preloadContent = value;
+
+    if (d->preloadContent) {
+        // we load all region's content, but we skip teh default one,
+        // as default one is always preloaded
+        for (int i = 0; i < d->regions.size(); i++) {
+            UCBottomEdgeRegion *region = d->regions[i];
+            UCBottomEdgeRegionPrivate::get(region)->loadRegionContent();
+        }
+    } else {
+        // discard all inactive regions content, except default one
+        for (int i = 0; i < d->regions.size(); i++) {
+            UCBottomEdgeRegion *region = d->regions[i];
+            if (region != d->activeRegion) {
+                UCBottomEdgeRegionPrivate::get(region)->discardRegionContent();
+            }
+        }
+    }
+
+    Q_EMIT preloadContentChanged();
+}
+
+/*
+ * Set the current content. The content is taken from the region if active, or foced
+ * is set. If the region has no item, the logic falls back to use the default region's
+ * content.
+ */
+void UCBottomEdgePrivate::setCurrentContent()
+{
+    QQuickItem *newContent = nullptr;
+    if (activeRegion) {
+        newContent = UCBottomEdgeRegionPrivate::get(activeRegion)->contentItem;
+        LOG << "ACTIVE REGION CONTENT" << activeRegion->objectName() << newContent;
+    }
+    if (!newContent) {
+        newContent = UCBottomEdgeRegionPrivate::get(defaultRegion)->contentItem;
+        LOG << "USING DEFAULT" << newContent;
+    }
+    resetCurrentContent(newContent);
+}
+/*
+ * Set the content to the default region one.
+ */
+void UCBottomEdgePrivate::resetCurrentContent(QQuickItem *newContent)
+{
+    if (newContent == currentContentItem) {
+        // same content, no need to reset to
+        return;
+    }
+    if (currentContentItem) {
+        // detach current content, the content will be deleted by the exiting region
+        currentContentItem->setVisible(false);
+        currentContentItem->setParentItem(nullptr);
+    }
+
+    if (!newContent) {
+        // try to use the default one
+        newContent = UCBottomEdgeRegionPrivate::get(defaultRegion)->contentItem;
+    }
+
+    // if it is still null, leave - we may not have default content at all!
+    if (!newContent) {
+        return;
+    }
+
+    LOG << "RESET CONTENT TO" << newContent;
+    currentContentItem = newContent;
+    currentContentItem->setParentItem(bottomPanel->m_panel);
+    QQuickAnchors *anchors = QQuickItemPrivate::get(currentContentItem.data())->anchors();
+    anchors->setHorizontalCenter(QQuickItemPrivate::get(bottomPanel->m_panel)->horizontalCenter());
+    currentContentItem->setVisible(true);
+    Q_EMIT q_func()->contentItemChanged();
+    patchContentItemHeader();
+}
+
 #include "moc_ucbottomedge.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
--- src/Ubuntu/Components/plugin/ucbottomedge.h	2015-12-11 12:10:54 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.h	2016-04-04 04:42:19 +0000
@@ -42,6 +42,7 @@
     Q_PROPERTY(QQuickItem* contentItem READ contentItem NOTIFY contentItemChanged FINAL)
     Q_PROPERTY(QQmlListProperty<UCBottomEdgeRegion> regions READ regions NOTIFY regionsChanged FINAL)
     Q_PROPERTY(UCBottomEdgeRegion* activeRegion READ activeRegion NOTIFY activeRegionChanged FINAL)
+    Q_PROPERTY(bool preloadContent READ preloadContent WRITE setPreloadContent NOTIFY preloadContentChanged FINAL DESIGNABLE false)
 
     // overloaded data property to catch regions
     Q_PRIVATE_PROPERTY(UCBottomEdge::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false)
@@ -73,6 +74,8 @@
     void setFillWindow(bool fill);
     QQmlListProperty<UCBottomEdgeRegion> regions();
     UCBottomEdgeRegion *activeRegion();
+    bool preloadContent() const;
+    void setPreloadContent(bool value);
 
 Q_SIGNALS:
     void dragProgressChanged(qreal dragProgress);
@@ -83,6 +86,7 @@
     void contentItemChanged();
     void regionsChanged();
     void activeRegionChanged(UCBottomEdgeRegion *activeRegion);
+    void preloadContentChanged();
 
     void commitStarted();
     void commitCompleted();
@@ -109,6 +113,7 @@
 
     Q_DECLARE_PRIVATE(UCBottomEdge)
 
+private:
     friend class tst_BottomEdge;
 };
 Q_DECLARE_METATYPE(UCBottomEdge::Status)
@@ -116,4 +121,6 @@
 
 Q_DECLARE_LOGGING_CATEGORY(ucBottomEdge)
 
+#define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
+
 #endif // UCBOTTOMEDGE_H

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-21 17:49:59 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2016-04-04 04:42:19 +0000
@@ -23,6 +23,10 @@
 #include "ucstyleditembase_p.h"
 #include "ucaction.h"
 
+#include <AsyncLoader>
+
+using namespace UbuntuToolkit;
+
 class UCBottomEdgeStyle;
 class UCBottomEdgePrivate : public UCStyledItemBasePrivate, protected QQuickItemChangeListener
 {
@@ -51,7 +55,6 @@
 
     // page header manipulation
     void patchContentItemHeader();
-    void createDefaultRegions();
     void updateProgressionStates(qreal distance);
     bool setActiveRegion(UCBottomEdgeRegion *range);
     void detectDirection(qreal currentDistance);
@@ -70,12 +73,14 @@
     void itemChildAdded(QQuickItem *item, QQuickItem *child);
     void itemChildRemoved(QQuickItem *item, QQuickItem *child);
 
+    void setCurrentContent();
+    void resetCurrentContent(QQuickItem *newItem);
     // members
-    QUrl contentUrl;
     QList<UCBottomEdgeRegion*> regions;
+    QPointer<QQuickItem> currentContentItem;
+    UCBottomEdgeRegion *defaultRegion;
     UCBottomEdgeRegion *activeRegion;
     UCBottomEdgeHint *hint;
-    QQmlComponent *contentComponent;
     UCBottomEdgeStyle *bottomPanel;
 
     qreal previousDistance;
@@ -93,6 +98,7 @@
 
     bool defaultRegionsReset:1;
     bool mousePressed:1;
+    bool preloadContent:1;
 
     // status management
     void setOperationStatus(OperationStatus s);

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2016-04-04 04:42:19 +0000
@@ -198,8 +198,16 @@
 void UCBottomEdgeHint::keyPressEvent(QKeyEvent *event)
 {
     UCActionItem::keyPressEvent(event);
-    if ((status() >= Active) && (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)) {
-        Q_EMIT clicked();
+    if (status() == Hidden)
+        return;
+    switch (event->key()) {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+        case Qt::Key_Space:
+            Q_EMIT clicked();
+            break;
+        default:
+            break;
     }
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2015-11-26 15:49:24 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2016-04-04 04:42:19 +0000
@@ -19,9 +19,31 @@
 #include "ucbottomedge.h"
 #include "ucbottomedge_p.h"
 #include "ucbottomedgeregion.h"
+#include "ucbottomedgeregion_p.h"
 #include "propertychange_p.h"
 #include <QtQml/private/qqmlproperty_p.h>
 
+
+UCBottomEdgeRegionPrivate::UCBottomEdgeRegionPrivate()
+    : QObjectPrivate()
+    , bottomEdge(Q_NULLPTR)
+    , component(Q_NULLPTR)
+    , contentItem(Q_NULLPTR)
+    , from(0.0)
+    , to(-1.0)
+    , enabled(true)
+    , active(false)
+{
+}
+
+void UCBottomEdgeRegionPrivate::init()
+{
+    Q_Q(UCBottomEdgeRegion);
+    bottomEdge = qobject_cast<UCBottomEdge*>(parent);
+    QObject::connect(&loader, SIGNAL(loadingStatus(AsyncLoader::LoadingStatus,QObject*)),
+            q, SLOT(onLoaderStatusChanged(AsyncLoader::LoadingStatus,QObject*)));
+}
+
 /*!
  * \qmltype BottomEdgeRegion
  * \instantiates UCBottomEdgeRegion
@@ -92,94 +114,201 @@
  */
 
 UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent)
-    : QObject(parent)
-    , m_bottomEdge(qobject_cast<UCBottomEdge*>(parent))
-    , m_component(Q_NULLPTR)
-    , m_urlBackup(Q_NULLPTR)
-    , m_componentBackup(Q_NULLPTR)
-    , m_from(0.0)
-    , m_to(-1.0)
-    , m_enabled(true)
-{
-}
-
-void UCBottomEdgeRegion::attachToBottomEdge(UCBottomEdge *bottomEdge)
-{
-    QQml_setParent_noEvent(this, bottomEdge);
-    m_bottomEdge = bottomEdge;
+    : QObject(*(new UCBottomEdgeRegionPrivate), parent)
+{
+    d_func()->init();
+}
+
+UCBottomEdgeRegion::UCBottomEdgeRegion(UCBottomEdgeRegionPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+    d_func()->init();
+}
+
+void UCBottomEdgeRegionPrivate::attachToBottomEdge(UCBottomEdge *bottomEdge)
+{
+    Q_Q(UCBottomEdgeRegion);
+    QQml_setParent_noEvent(q, bottomEdge);
+    this->bottomEdge = bottomEdge;
     // adjust to property value if not set yet
-    if (m_to <= 0.0) {
-        m_to = 1.0;
-        Q_EMIT toChanged();
+    if (to <= 0.0) {
+        to = 1.0;
+        Q_EMIT q->toChanged();
+    }
+
+    // if preload is set, load content
+    if (bottomEdge->preloadContent()) {
+        loadRegionContent();
     }
 }
 
 bool UCBottomEdgeRegion::contains(qreal dragRatio)
 {
-    return (m_enabled && (m_from < m_to) && dragRatio >= m_from && dragRatio <= m_to);
+    Q_D(UCBottomEdgeRegion);
+    return (d->enabled && (d->from < d->to) && dragRatio >= d->from && dragRatio <= d->to);
+}
+
+// Called when drag ends to check whether content can be committed. The default
+// implementation returns true.
+bool UCBottomEdgeRegion::canCommit(qreal dragRatio)
+{
+    Q_UNUSED(dragRatio);
+    return true;
 }
 
 void UCBottomEdgeRegion::enter()
 {
+    Q_D(UCBottomEdgeRegion);
+    d->active = true;
     Q_EMIT entered();
-    // backup url
-    if (m_url.isValid()) {
-        m_urlBackup = new PropertyChange(m_bottomEdge, "contentUrl");
-        QQmlProperty property(this, "contentUrl", qmlContext(this));
-        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
-        if (binding) {
-            PropertyChange::setBinding(m_urlBackup, binding);
-        } else {
-            PropertyChange::setValue(m_urlBackup, m_url);
-        }
-    }
-    if (m_component) {
-        m_componentBackup = new PropertyChange(m_bottomEdge, "contentComponent");
-        QQmlProperty property(this, "contentComponent", qmlContext(this));
-        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
-        if (binding) {
-            PropertyChange::setBinding(m_componentBackup, binding);
-        } else {
-            PropertyChange::setValue(m_componentBackup, QVariant::fromValue<QQmlComponent*>(m_component));
-        }
+
+    LOG << "ENTER REGION" << objectName();
+    // if preloaded, or default(?), set the content
+    if (d->bottomEdge->preloadContent()) {
+        if (d->loader.status() == UbuntuToolkit::AsyncLoader::Ready) {
+            LOG << "SET REGION CONTENT" << objectName();
+            UCBottomEdgePrivate::get(d->bottomEdge)->setCurrentContent();
+        }
+    } else {
+        // initiate loading, component has priority
+        d->loadRegionContent();
     }
 }
 
 void UCBottomEdgeRegion::exit()
 {
-    if (m_componentBackup) {
-        delete m_componentBackup;
-        m_componentBackup = Q_NULLPTR;
-    }
-    if (m_urlBackup) {
-        delete m_urlBackup;
-        m_urlBackup = Q_NULLPTR;
-    }
+    Q_D(UCBottomEdgeRegion);
+    d->active = false;
     Q_EMIT exited();
+
+    // detach content from BottomEdge
+    LOG << "EXIT REGION" << objectName();
+    UCBottomEdgePrivate::get(d->bottomEdge)->resetCurrentContent(nullptr);
+
+    // then cleanup
+    if (!d->contentItem) {
+        return;
+    }
+    LOG << "RESET REGION CONTENT" << objectName();
+    if (!d->bottomEdge->preloadContent()) {
+        LOG << "DISCARD REGION CONTENT" << objectName();
+        d->discardRegionContent();
+    }
 }
 
 const QRectF UCBottomEdgeRegion::rect(const QRectF &bottomEdgeRect)
 {
+    Q_D(UCBottomEdgeRegion);
     QRectF regionRect(
-                bottomEdgeRect.topLeft() + QPointF(0, bottomEdgeRect.height() * (1.0 - m_to)),
-                QSizeF(bottomEdgeRect.width(), bottomEdgeRect.height() * (m_to - m_from)));
+                bottomEdgeRect.topLeft() + QPointF(0, bottomEdgeRect.height() * (1.0 - d->to)),
+                QSizeF(bottomEdgeRect.width(), bottomEdgeRect.height() * (d->to - d->from)));
     return regionRect;
 }
 
+void UCBottomEdgeRegionPrivate::loadRegionContent()
+{
+    if (!enabled) {
+        return;
+    }
+    LOG << "LOAD REGION CONTENT" << q_func()->objectName() << contentItem;
+    if (component) {
+        loadContent(LoadingComponent);
+    } else if (url.isValid()) {
+        loadContent(LoadingUrl);
+    }
+}
+
+void UCBottomEdgeRegionPrivate::loadContent(LoadingType type)
+{
+    // we must delete the previous content before we (re)initiate loading
+    if (contentItem) {
+        contentItem->deleteLater();;
+        contentItem = nullptr;
+    }
+    // no need to create new context as we do not set any context properties
+    // for which we would need one
+    switch (type) {
+    case LoadingUrl:
+        loader.load(url, qmlContext(bottomEdge));
+        return;
+    case LoadingComponent:
+        loader.load(component, qmlContext(bottomEdge));
+        return;
+    }
+}
+
+void UCBottomEdgeRegionPrivate::discardRegionContent()
+{
+    loader.reset();
+    if (contentItem) {
+        LOG << "DISCARD CONTENT" << q_func()->objectName();
+        contentItem->deleteLater();
+    }
+    contentItem = nullptr;
+}
+
+void UCBottomEdgeRegionPrivate::onLoaderStatusChanged(AsyncLoader::LoadingStatus status, QObject *object)
+{
+    bool emitChange = false;
+    LOG << "STATUS" << status << object;
+    if (status == UbuntuToolkit::AsyncLoader::Ready) {
+        // if we are no longer active, no need to continue, and discard content
+        // this may occur when the component was still in Compiling state while
+        // the region was exited, therefore reset() could not cancel the operation.
+        if (!active && !bottomEdge->preloadContent()) {
+            LOG << "DELETE REGION CONTENT" << q_func()->objectName();
+            object->deleteLater();
+            return;
+        }
+        contentItem = qobject_cast<QQuickItem*>(object);
+        emitChange = active;
+    }
+
+    if (status == UbuntuToolkit::AsyncLoader::Reset) {
+        // de-parent first
+        if (contentItem) {
+            contentItem->setParentItem(nullptr);
+            LOG << "RESET CONTENT" << q_func()->objectName();
+            contentItem->deleteLater();
+        }
+        contentItem = nullptr;
+        emitChange = true;
+    }
+
+    if (emitChange && bottomEdge && active) {
+        UCBottomEdgePrivate::get(bottomEdge)->setCurrentContent();
+    }
+}
+
 /*!
  * \qmlproperty bool BottomEdgeRegion::enabled
  * Enables the section. Disabled sections do not trigger nor change the BottomEdge
  * content. Defaults to false.
  */
+bool UCBottomEdgeRegion::enabled() const
+{
+    Q_D(const UCBottomEdgeRegion);
+    return d->enabled;
+}
 void UCBottomEdgeRegion::setEnabled(bool enabled)
 {
-    if (enabled == m_enabled) {
+    Q_D(UCBottomEdgeRegion);
+    if (enabled == d->enabled) {
         return;
     }
-    m_enabled = enabled;
-    if (m_bottomEdge) {
-        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    d->enabled = enabled;
+    if (d->bottomEdge) {
+        UCBottomEdgePrivate::get(d->bottomEdge)->validateRegion(this);
+        // load content if preload is set
+        if (d->bottomEdge->preloadContent()) {
+            if (!d->enabled) {
+                d->discardRegionContent();
+            } else {
+                d->loadRegionContent();
+            }
+        }
     }
+
     Q_EMIT enabledChanged();
 }