Merge lp:~mterry/ubuntu-ui-toolkit/monitor-only into lp:ubuntu-ui-toolkit

[Michael Terry]

Add monitorOnly field to SwipeArea.
This field controls whether the SwipeArea takes ownership of the gestures it observes.

From linked bug:

== Ask ==

I want to add SwipeArea.monitorOnly (name is up for debate) which lets input events "fall through" (i.e. it doesn't own them) but continues to monitor them.

I have a specific need for it, but it might be a generally useful thing?

== Backstory ==

Recently, the UITK got SwipeArea, which is great. In unity8, I'm working on a redesign of the edge introduction tutorial on first boot of your device.

There's a part of it where we put a shell-wide overlay on top of the screen that says "Swipe from the bottom to do ..." and this should fade out as the user swipes up (but should do the right thing if the drag isn't completed or is held in place).

One way to do this would be to communicate with the app. But that's a lot of infrastructure for one little feature. And this feature might be short-lived, because eventually we're going to try to move those "coach mark" help screens in the UITK as well for apps to use themselves. But for now, the shell is showing the bottom edge coach mark for a select few apps.

So another easy way to do it is to be able to monitor the user's drag, but not interfere with it. So the shell can see what the drag is doing, but the app still does the drag itself.

== Next Steps ==

I'd like this branch reviewed for sanity, to see if it's something you folks are OK with. It's missing tests, but I'm waiting to add those until you all let me know it wouldn't be wasted effort. :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1272
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/70/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/ubuntu-ui-toolkit/monitor-only]

1273. By Michael Terry on 2016-01-04

Update components.api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2251/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/75/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/ubuntu-ui-toolkit/monitor-only]

1274. By Michael Terry on 2016-01-04

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1274
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2252/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/76/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/ubuntu-ui-toolkit/monitor-only]

1275. By Michael Terry on 2016-01-04

Fix build

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1275
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/77/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

I think grabGesture as property name would be better than monitorOnly.

Secondly, please submit your MR agains UITK staging lp:ubuntu-ui-toolkit/staging.

review: Needs Fixing

[lp:~mterry/ubuntu-ui-toolkit/monitor-only]

1276. By Michael Terry on 2016-01-08

Switch property name to grabGesture

1277. By Michael Terry on 2016-01-08

Merge staging

1278. By Michael Terry on 2016-01-08

Fix components.api

1279. By Michael Terry on 2016-03-04

Merge from staging

1280. By Michael Terry on 2016-03-04

Fix style

1281. By Michael Terry on 2016-03-07

Add a couple grabGesture tests

Unmerged revisions

=== modified file 'apicheck/apicheck.cpp'
--- apicheck/apicheck.cpp	2015-12-02 09:22:28 +0000
+++ apicheck/apicheck.cpp	2016-01-08 17:10:46 +0000
@@ -484,6 +484,10 @@
         writeMetaContent(&object, mainMeta, &knownAttributes);
 
         object["namespace"] = nameSpace;
+        // The QML class name derived from the filename is used by AP.
+        QString className(QFileInfo(filename).baseName());
+        if (typeName != className)
+            object["className"] = className;
         json->insert(id, object);
     }
 
@@ -552,6 +556,10 @@
             return;
         }
 
+        // The C++ class is used by AP.
+        QString className(meta->className());
+        if (!(isSingleton || isUncreatable || exportStrings.empty()))
+            object["className"] = className;
         json->insert(id, object);
     }
 
@@ -1102,6 +1110,8 @@
                 QString signature(exports);
                 if (object.contains("namespace"))
                     signature = object.take("namespace").toString() + "." + signature;
+                if (object.contains("className"))
+                    signature += " " + object.take("className").toString();
                 QString prototype(object.take("prototype").toString());
                 if (!prototype.isEmpty())
                     signature += ": " + convertToId(prototype);

=== modified file 'components.api'
--- components.api	2015-12-17 09:15:45 +0000
+++ components.api	2016-01-08 17:10:46 +0000
@@ -3,12 +3,12 @@
     signal clicked()
     signal pressAndHold()
     property bool pressed
-Ubuntu.Components.AbstractButton 1.3: ActionItem
+Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem
     readonly property bool hovered
     signal clicked()
     signal pressAndHold()
     readonly property bool pressed
-Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
+Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
     property string description
     property bool enabled
     property string iconName
@@ -40,12 +40,12 @@
     property string overflowIconName
     property url overflowIconSource
     property string overflowText
-Ubuntu.Components.ActionContext 1.0 0.1: QtObject
+Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject
     default property list<Action> actions
     property bool active
     function addAction(Action action)
     function removeAction(Action action)
-Ubuntu.Components.ActionItem 1.0 0.1: StyledItem
+Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem
     property Action action
     property string iconName
     property url iconSource
@@ -59,7 +59,7 @@
 Ubuntu.Components.ActionList 1.3: QtObject
     property list<Action> actions
     default property list<Action> children
-Ubuntu.Components.ActionManager 1.0 0.1: QtObject
+Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
     default property list<Action> actions
     readonly property ActionContext globalContext
     property list<ActionContext> localContexts
@@ -90,7 +90,7 @@
     function var removePages(var page)
     property Page primaryPage
     property var primaryPageSource
-Ubuntu.Components.Alarm 1.0 0.1: QtObject
+Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject
     property QDateTime date
     property DaysOfWeek daysOfWeek
     property bool enabled
@@ -144,17 +144,17 @@
     Fail
     InProgress
     Ready
-Ubuntu.Components.AlarmModel 1.0 0.1: QAbstractListModel
+Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
     readonly property int count
     function refresh() 1.0
     function UCAlarm* get(int index)
-Ubuntu.Components.Argument 1.0 0.1: QtObject
+Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
     property string help
     function var at(int i)
     property string name
     property bool required
     property QStringList valueNames
-Ubuntu.Components.Arguments 1.0 0.1: QtObject
+Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject
     default property list<Argument> arguments
     property Argument defaultArgument
     readonly property bool error
@@ -175,7 +175,7 @@
     property var icon
     property bool iconFrame
     property bool progression
-Ubuntu.Components.BottomEdge 1.3: StyledItem
+Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem
     readonly property BottomEdgeRegion activeRegion
     property Component contentComponent
     readonly property Item contentItem
@@ -205,7 +205,7 @@
     Committed
     Hidden
     Revealed
-Ubuntu.Components.BottomEdgeHint 1.3: ActionItem
+Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem
     property int deactivateTimeout
     property Flickable flickable
     signal clicked()
@@ -216,7 +216,7 @@
     Hidden
     Inactive
     Locked
-Ubuntu.Components.BottomEdgeRegion 1.3: QtObject
+Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject
     property Component contentComponent
     property url contentUrl
     property bool enabled
@@ -225,7 +225,7 @@
     signal exited()
     signal dragEnded()
     property double to
-Ubuntu.Components.Styles.BottomEdgeStyle 1.3: Item
+Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item
     property Item contentItem
     property Item panel
     property Animation panelAnimation
@@ -299,22 +299,22 @@
 Ubuntu.Components.Popups.ComposerSheet 1.3: SheetBase
     signal cancelClicked()
     signal confirmClicked()
-Ubuntu.Layouts.ConditionalLayout 1.0 0.1: QtObject
+Ubuntu.Layouts.ConditionalLayout 1.0 0.1 ULConditionalLayout: QtObject
     default property Component layout
     property string name
     property QQmlBinding when
-Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1: Item
+Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1 UPMCpuUsage: Item
     readonly property UPMGraphModel graphModel
     property int period
     property int samplingInterval
-Ubuntu.Components.CrossFadeImage 1.0 0.1: Item
+Ubuntu.Components.CrossFadeImage 1.0 0.1 CrossFadeImage10: Item
     property int fadeDuration
     property int fillMode
     readonly property bool running
     property url source
     property QSizeF sourceSize
     readonly property int status
-Ubuntu.Components.CrossFadeImage 1.1: Item
+Ubuntu.Components.CrossFadeImage 1.1 CrossFadeImage11: Item
     property int fadeDuration
     property string fadeStyle
     property int fillMode
@@ -468,7 +468,7 @@
     readonly property bool enabled
     function play(var customEffect)
     function play()
-Ubuntu.Components.ListItems.Header 1.0 0.1: Item
+Ubuntu.Components.ListItems.Header 1.0 0.1 ListItemHeader: Item
     property string text
 Ubuntu.Components.Header 1.0 0.1: AppHeader
     property string _for_autopilot
@@ -486,9 +486,9 @@
     property var tabsModel
     property string title
     property bool useDeprecatedToolbar
-Ubuntu.Components.ListItems.Header 1.3: Item
+Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
     property string text
-Ubuntu.Components.Header 1.3: StyledItem
+Ubuntu.Components.Header 1.3 UCHeader: StyledItem
     property bool exposed
     property Flickable flickable
     readonly property bool moving
@@ -498,12 +498,12 @@
     property string name
 Ubuntu.Components.Icon 1.1: Icon
     property url source
-Ubuntu.Components.InverseMouse 1.0 0.1: Mouse
-Ubuntu.Components.InverseMouseArea 1.0 0.1: MouseArea
+Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
+Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
     function bool contains(QPointF point)
     property Item sensingArea
     property bool topmostItem
-Ubuntu.Layouts.ItemLayout 1.0 0.1: Item
+Ubuntu.Layouts.ItemLayout 1.0 0.1 ULItemLayout: Item
     property string item
 Ubuntu.Components.ListItems.ItemSelector 1.0 0.1: Empty
     property bool colourImage
@@ -531,7 +531,7 @@
     property int selectedIndex
 Ubuntu.Components.Label 1.0 0.1: Text
     property string fontSize
-Ubuntu.Components.Label 1.3: Text
+Ubuntu.Components.Label 1.3 UCLabel: Text
     property string fontSize
     property TextSize textSize
 Ubuntu.Components.Label.TextSize: Enum
@@ -541,10 +541,10 @@
     XLarge
     XSmall
     XxSmall
-Ubuntu.Layouts.Layouts 1.0 0.1: Item
+Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
     readonly property string currentLayout
     property list<ConditionalLayout> layouts
-Ubuntu.Components.ListItem 1.3 1.2: StyledItem
+Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem
     property Action action
     property color color
     readonly property Item contentItem
@@ -567,7 +567,7 @@
     property bool swipeEnabled 1.3
     readonly property bool swiped 1.3
     property ListItemActions trailingActions
-Ubuntu.Components.ListItemActions 1.2: QtObject
+Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject
     property list<Action> actions
     default property list<QtObject> data
     property Component delegate
@@ -582,11 +582,11 @@
     Dropped
     Moving
     Started
-Ubuntu.Components.ListItemLayout 1.3: SlotsLayout
+Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout
     readonly property Label subtitle
     readonly property Label summary
     readonly property Label title
-Ubuntu.Components.Styles.ListItemStyle 1.3 1.2: Item
+Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item
     readonly property bool animatePanels
     property Item dragPanel
     property PropertyAnimation dropAnimation
@@ -595,7 +595,7 @@
     function swipeEvent(SwipeEvent event)
     function rebound()
     property Animation snapAnimation
-Ubuntu.Components.LiveTimer 1.3: QtObject
+Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject
     property Frequency frequency
     signal trigger()
     property QDateTime relativeTime
@@ -609,7 +609,7 @@
     property bool automaticOrientation
     default property list<QtObject> contentsItem
     property bool useDeprecatedToolbar
-Ubuntu.Components.MainView 1.2: MainViewBase
+Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
     property bool automaticOrientation
     default property list<QtObject> contentsItem
 Ubuntu.Components.MainView 1.3: MainViewBase
@@ -620,14 +620,14 @@
     function double lerp(double delta, double from, double to)
     function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
     function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
-Ubuntu.Components.MimeData 1.0 0.1: QtObject
+Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
     property color color
     property var data
     readonly property QStringList formats
     property string html
     property string text
     property list<url> urls
-Ubuntu.Components.Mouse 1.0 0.1: QtObject
+Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject
     readonly property Qt.MouseButtons acceptedButtons
     property int clickAndHoldThreshold
     property bool enabled
@@ -707,12 +707,12 @@
     property int orientationAngle
     readonly property bool rotating
     property bool transitionEnabled
-Ubuntu.Components.Page 1.0 0.1: PageTreeNode
+Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
     property list<Action> actions
     property Flickable flickable
     property string title
     property Item tools
-Ubuntu.Components.Page 1.1: Page10
+Ubuntu.Components.Page 1.1 Page11: Page10
     readonly property PageHeadConfiguration head
 Ubuntu.Components.Page 1.3: PageTreeNode
     property Flickable flickable
@@ -810,7 +810,7 @@
     function var push(var page, var properties)
     function var pop()
     function var clear()
-Ubuntu.Components.PageTreeNode 1.3: StyledItem
+Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem
     property bool active
     readonly property Item activeLeafNode
     property bool isLeaf
@@ -965,7 +965,7 @@
     property double value
 Ubuntu.Components.ProgressionSlot 1.3: Icon
     property url source
-Ubuntu.Components.ProportionalShape 1.3: UbuntuShape
+Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
 Ubuntu.Components.PullToRefresh 1.1: StyledItem
     property Component content
     signal refresh()
@@ -984,7 +984,7 @@
     property double activationThreshold
     property Component defaultContent
     property bool releaseToRefresh
-Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1: Item
+Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
     readonly property UPMGraphModel graphModel
     signal frameRendered(qlonglong renderTime)
     property int period
@@ -1004,7 +1004,7 @@
     property list<Action> actions
     property var model
     property int selectedIndex
-Ubuntu.Components.ServiceProperties 1.1: QtObject
+Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
     property string adaptorInterface 1.1
     readonly property string error 1.1
     property string path 1.1
@@ -1062,7 +1062,7 @@
     property bool overrideVerticalPositioning
     readonly property SlotsLayoutPadding padding
     property SlotsLayout.UCSlotPosition position
-Ubuntu.Components.SlotsLayout 1.3: Item
+Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
     property Item mainSlot
     readonly property SlotsLayoutPadding padding
 Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
@@ -1078,7 +1078,7 @@
 Ubuntu.Components.SortBehavior 1.1: QtObject
     property Qt.SortOrder order
     property string property
-Ubuntu.Components.SortFilterModel 1.1: QSortFilterProxyModel
+Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel
     readonly property int count
     readonly property FilterBehavior filter
     function QVariantMap get(int row)
@@ -1099,10 +1099,10 @@
     property var icon
     property bool iconFrame
     property bool progression
-Ubuntu.Components.StateSaver 1.0 0.1: QtObject
-Ubuntu.Components.StyleHints 1.3: QtObject
+Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
+Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
     property bool ignoreUnknownProperties
-Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1: Item
+Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
     property bool activeFocusOnPress 1.3
     readonly property bool keyNavigationFocus 1.3
     signal activeFocusOnTabChanged2() 1.3
@@ -1115,7 +1115,7 @@
     property string subText
 Ubuntu.Components.ListItems.Subtitled 1.3: Base
     property string subText
-Ubuntu.Components.SwipeArea 1.3: Item
+Ubuntu.Components.SwipeArea 1.3 UCSwipeArea: Item
     property Direction direction
     readonly property double distance
     readonly property bool dragging
@@ -1126,6 +1126,8 @@
     signal distanceChanged(double distance)
     signal touchPositionChanged(QPointF position)
     signal immediateRecognitionChanged(bool immediateRecognition)
+    signal grabGestureChanged(bool grabGesture)
+    property bool grabGesture
     readonly property bool pressed
     readonly property QPointF touchPosition
 Ubuntu.Components.SwipeArea.Direction: Enum
@@ -1205,6 +1207,7 @@
     function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button, Qt.KeyboardModifiers stateKey, int steps)
     function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button, Qt.KeyboardModifiers stateKey)
     function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
+    function removeTimeConstraintsFromSwipeArea(Item item)
     readonly property bool touchPresent
 Ubuntu.Components.TextArea 1.0 0.1: StyledItem
     property bool autoExpand
@@ -1447,9 +1450,9 @@
     readonly property int selectionStart
     property QValidator validator
     property int verticalAlignment
-Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1: Item
+Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
     property QImage image
-Ubuntu.Components.ThemeSettings 1.3: QtObject
+Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
     property string name
     property QtObject palette
     readonly property ThemeSettings parentTheme
@@ -1559,13 +1562,14 @@
     readonly property color warmGrey
 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
     property int expandedIndex
-Ubuntu.Components.UbuntuListView 1.1: UbuntuListView
+Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
     readonly property PullToRefresh pullToRefresh
-Ubuntu.Components.UbuntuListView 1.3: UbuntuListView
+Ubuntu.Components.UbuntuListView 1.3: ListView
+    property int expandedIndex
     readonly property PullToRefresh pullToRefresh
 Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
 Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation
-Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1: Item
+Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item
     property Aspect aspect 1.3
     property color backgroundColor 1.3
     property BackgroundMode backgroundMode 1.3
@@ -1611,7 +1615,7 @@
 Ubuntu.Components.UbuntuShape.WrapMode: Enum
     Repeat
     Transparent
-Ubuntu.Components.UbuntuShapeOverlay 1.2: UbuntuShape
+Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape
     property color overlayColor
     property QRectF overlayRect
 Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase

=== modified file 'debian/control'
--- debian/control	2015-12-16 09:55:02 +0000
+++ debian/control	2016-01-08 17:10:46 +0000
@@ -107,6 +107,15 @@
  This package contains the development files for 
  Ubuntu gestures library with SwipeArea
 
+Package: libubuntugestures5-private-dev
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu gestures library private development files
+ This package contains the private development files for
+ Ubuntu gestures library with SwipeArea
 
 
 Package: ubuntu-ui-toolkit-theme

=== added file 'debian/libubuntugestures5-private-dev.install'
--- debian/libubuntugestures5-private-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntugestures5-private-dev.install	2016-01-08 17:10:46 +0000
@@ -0,0 +1,3 @@
+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 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2015-03-03 13:47:48 +0000
+++ documentation/ubuntu-components.qdoc	2016-01-08 17:10:46 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 1.2
+    \qmlmodule Ubuntu.Components 1.3
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-09-01 11:59:13 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2016-01-08 17:10:46 +0000
@@ -29,7 +29,7 @@
 excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
 outputdir = $BLD/html
 outputformats = HTML
-version = 1.2
+version = 1.3
 syntaxhighlighting = true
 sourceencoding = UTF-8
 outputencoding = UTF-8

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-06-19 05:14:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-01-08 17:10:46 +0000
@@ -50,8 +50,8 @@
                 objectName: "button_color"
                 width: units.gu(20)
                 action: Action {
-                    text: i18n.tr("Call %1").arg(shortcut)
-                    shortcut: 'Ctrl+C'
+                    text: i18n.tr("C&all %1").arg(shortcut)
+                    shortcut: 'Ctrl+L'
                     property bool flipped
                     onTriggered: flipped = !flipped
                 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-09-21 14:44:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Label.qml	2016-01-08 17:10:46 +0000
@@ -28,27 +28,27 @@
 
             Label {
                 textSize: Label.XxSmall
-                text: "xx-small"
+                text: "Label.XxSmall"
             }
             Label {
                 textSize: Label.XSmall
-                text: "x-small"
+                text: "Label.XSmall"
             }
             Label {
                 textSize: Label.Small
-                text: "small"
+                text: "Label.Small"
             }
             Label {
                 textSize: Label.Medium
-                text: "medium"
+                text: "Label.Medium"
             }
             Label {
                 textSize: Label.Large
-                text: "large"
+                text: "Label.Large"
             }
             Label {
                 textSize: Label.XLarge
-                text: "x-large"
+                text: "Label.XLarge"
             }
         }
     }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-12-15 14:20:33 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2016-01-08 17:10:46 +0000
@@ -66,6 +66,18 @@
                 iconName: "starred"
                 visible: !QuickUtils.mouseAttached
                 onTriggered: QuickUtils.mouseAttached = true
+            },
+            Action {
+                text: i18n.tr("Detach keyboard")
+                iconName: "non-starred"
+                visible: QuickUtils.keyboardAttached
+                onTriggered: QuickUtils.keyboardAttached = false
+            },
+            Action {
+                text: i18n.tr("Attach keyboard")
+                iconName: "starred"
+                visible: !QuickUtils.keyboardAttached
+                onTriggered: QuickUtils.keyboardAttached = true
             }
         ]
     }
@@ -101,36 +113,14 @@
 
         delegate: ListItem {
             objectName: model.objectName
-            contentItem {
-                anchors.leftMargin: units.gu(2)
-                anchors.rightMargin: units.gu(2)
-            }
             enabled: source != ""
             // Used by Autopilot
             property string text: label
             onClicked: widgetList.currentIndex = index
-            Label {
-                id: labelItem
-                anchors {
-                    fill: parent
-                    rightMargin: units.gu(4)
-                }
-                text: label
-                verticalAlignment: Text.AlignVCenter
-            }
-            Icon {
-                name: "next"
-                width: units.gu(2)
-                height: units.gu(2)
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    right: parent.right
-                }
-            }
-        }
-        highlight: Rectangle {
-            color: theme.palette.selected.background
-        }
-        highlightMoveDuration: 0
+            ListItemLayout {
+                title.text: label
+                ProgressionSlot {}
+            }
+        }
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-04-29 07:21:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2016-01-08 17:10:46 +0000
@@ -16,7 +16,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Template {
     objectName: "ubuntuListViewTemplate"
@@ -52,9 +51,14 @@
             height: units.gu(36)
             model: fruitModel
             clip: true
+            currentIndex: -1
 
-            delegate: ListItem.Standard {
-                text: name
+            delegate: ListItem {
+                ListItemLayout {
+                    title.text: name
+                }
+                // to enable highlight
+                onClicked: ListView.view.currentIndex = index
             }
 
             pullToRefresh {

=== modified file 'src/Ubuntu/Components/1.2/TextField.qml'
--- src/Ubuntu/Components/1.2/TextField.qml	2015-12-14 15:47:03 +0000
+++ src/Ubuntu/Components/1.2/TextField.qml	2016-01-08 17:10:46 +0000
@@ -929,7 +929,7 @@
             width: units.gu(2.5)
             height: width
             // use icon from icon-theme
-            name: control.hasClearButton && !control.readOnly ? "clear-search" : ""
+            name: control.hasClearButton && !control.readOnly ? "edit-clear" : ""
         }
 
         onClicked: editor.text = ""

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-29 10:03:14 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-01-08 17:10:46 +0000
@@ -777,6 +777,7 @@
 
                 property color dividerColor: layout.__propagated.header.dividerColor
                 property color panelColor: layout.__propagated.header.panelColor
+                property color backgroundColor: layout.__propagated.header.backgroundColor
 
                 visible: !customHeader && holder.pageWrapper && holder.pageWrapper.active
 

=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2015-12-14 20:38:59 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2016-01-08 17:10:46 +0000
@@ -32,6 +32,11 @@
     }
 
     /*!
+      The background color of the header. Value set by MainView.
+     */
+    property color backgroundColor
+
+    /*!
       The background color of the divider. Value set by MainView.
      */
     property color dividerColor

=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2015-10-13 13:37:43 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2016-01-08 17:10:46 +0000
@@ -121,28 +121,10 @@
                     UbuntuApplication.inputMethod.keyboardRectangle.height : 0
         }
 
-        // clip the contents so that it does not overlap the header
         Item {
-            id: contentsClipper
+            id: contents
             anchors {
-                left: parent.left
-                right: parent.right
-                top: headerItem.bottom
-                bottom: parent.bottom
-            }
-            // only clip when necessary
-            // ListView headers may be positioned at the top, independent from
-            // flickable.contentY, so do not clip depending on activePage.flickable.contentY.
-            clip: headerItem.bottomY > 0 && internal.activePage && internal.activePage.flickable
-
-            Item {
-                id: contents
-                anchors {
-                    fill: parent
-                    
-                    // compensate so that the actual y is always 0
-                    topMargin: -parent.y
-                }
+                fill: parent
             }
         }
 
@@ -159,6 +141,7 @@
             property real bottomY: headerItem.y + headerItem.height
             dividerColor: Qt.darker(mainView.headerColor, 1.1)
             panelColor: Qt.lighter(mainView.headerColor, 1.1)
+            backgroundColor: mainView.headerColor
 
             title: internal.activePage ? internal.activePage.title : ""
             pageStack: internal.activePage ? internal.activePage.pageStack : null
@@ -179,7 +162,8 @@
             // don't show the application header if the page has its own header.
             visible: !(internal.activePage &&
                        internal.activePage.hasOwnProperty("header") &&
-                       internal.activePage.header)
+                       internal.activePage.header) &&
+                     internal.activePage
 
             height: visible ? implicitHeight : 0
 

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-12-15 19:31:38 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-01-08 17:10:46 +0000
@@ -329,6 +329,11 @@
       inputs. See QLineEdit::inputMask for further details, as the exact same mask strings
       are used by TextField.
 
+      Note that when using an inputMask together with echoMode to hide the input
+      the empty TextField may still show masked characters - consider \l validator instead.
+
+      \sa acceptableInput, validator
+
       \qmlproperty string inputMask
     */
     property alias inputMask: editor.inputMask
@@ -534,6 +539,19 @@
       }
       \endqml
 
+      The next example is for a use case of typing a PIN with masked characters.
+
+      \qml
+      import QtQuick 2.4
+      import Ubuntu.Components 1.3
+
+      TextField {
+          echoMode: TextInput.Password
+          validator: RegExpValidator { regExp: /^\d{4}$/ }
+          inputMethodHints: Qt.ImhDigitsOnly
+      }
+      \endqml
+
       \sa acceptableInput, inputMask
 
       \qmlproperty Validator validator
@@ -939,7 +957,7 @@
             width: units.gu(2.5)
             height: width
             // use icon from icon-theme
-            name: control.hasClearButton && !control.readOnly ? "clear-search" : ""
+            name: control.hasClearButton && !control.readOnly ? "edit-clear" : ""
         }
 
         onClicked: editor.text = ""

=== removed file 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit
-
-/*!
-    \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A ListView with special features tailored for a look and feel fitting the
-    Ubuntu Touch platform.
-    The UbuntuListView works just like a regular ListView, but it adds special features
-    such as expanding/collapsing items (when used together with the Expandable item).
-    It provides features like automatically positioning the expanding item when it
-    expands and collapsing it again when the user taps outside of it.
-
-    Examples:
-    \qml
-        import Ubuntu.Components 1.3
-        import Ubuntu.Components.ListItems 1.3 as ListItem
-
-        Item {
-            ListModel {
-                id: listModel
-            }
-
-            UbuntuListView {
-                id: ubuntuListView
-                anchors { left: parent.left; right: parent.right }
-                height: units.gu(24)
-                model: listModel
-
-                delegate: ListItem.Expandable {
-                    id: expandingItem
-
-                    expandedHeight: units.gu(30)
-
-                    onClicked: {
-                        ubuntuListView.expandedIndex = index;
-                    }
-                }
-            }
-        }
-    \endqml
-*/
-
-ListView {
-    id: root
-
-    /*!
-      The index of the currently expanded item. -1 if no item is expanded.
-     */
-    property int expandedIndex: -1
-
-    QtObject {
-        id: priv
-
-        function positionViewAtIndexAnimated(expandedIndex) {
-            animation.from = root.contentY;
-            root.currentIndex = expandedIndex;
-            if (expandedIndex == root.count - 1) {
-                root.positionViewAtIndex(expandedIndex, ListView.End);
-            } else {
-                root.positionViewAtIndex(expandedIndex + 1, ListView.End);
-            }
-
-            var effectiveExpandedHeight = Math.min(root.currentItem.expandedHeight, root.height - root.currentItem.collapsedHeight);
-            if (root.contentY - root.originY == 0) {
-                if (((root.currentIndex + 1) * root.currentItem.collapsedHeight) + effectiveExpandedHeight > root.height) {
-                    animation.to = ((root.currentIndex + 1) * root.currentItem.collapsedHeight + effectiveExpandedHeight) - root.height + root.originY
-                } else {
-                    animation.to = root.originY
-                }
-            } else {
-                animation.to = root.contentY + (effectiveExpandedHeight - root.currentItem.collapsedHeight);
-            }
-            animation.start();
-        }
-
-        function requestFocus(reason) {
-            // lookup for the currentItem, and if it is a FocusScope, focus the view
-            // this will also focus the currentItem
-            if (root.currentItem && root.currentItem.hasOwnProperty("activeFocusOnPress")) {
-                root.forceActiveFocus(reason);
-            }
-        }
-    }
-
-    focus: true
-
-    /*!
-      \internal
-      Grab focus when moved, flicked or clicked
-     */
-    onMovementStarted: priv.requestFocus(Qt.MouseFocusReason)
-    onFlickStarted: priv.requestFocus(Qt.MouseFocusReason)
-    Toolkit.Mouse.onClicked: priv.requestFocus(Qt.MouseFocusReason)
-
-    /*!
-      Expand the item at the given index.
-     */
-    onExpandedIndexChanged: {
-        if (expandedIndex < 0) {
-            return;
-        }
-        priv.positionViewAtIndexAnimated(expandedIndex, ListView.End)
-    }
-
-    UbuntuNumberAnimation {
-        id: animation
-        target: root
-        property: "contentY"
-    }
-
-    MouseArea {
-        parent: contentItem
-        anchors.fill: parent
-        z: 2
-        enabled: root.expandedIndex != -1
-        onClicked: root.expandedIndex = -1;
-    }
-
-    // animate move displaced
-    moveDisplaced: Transition {
-        UbuntuNumberAnimation {
-            properties: "x,y"
-        }
-    }
-}

=== renamed file 'src/Ubuntu/Components/1.3/UbuntuListView11.qml' => 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView11.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-01-08 17:10:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,19 +15,188 @@
  */
 
 import QtQuick 2.4
-
-// documentation in UbuntuListView11.qdoc
-UbuntuListView {
-
-    /*!
-      \internal
-      \qmlproperty PullToRefresh pullToRefresh
+import Ubuntu.Components 1.3 as Toolkit
+
+/*!
+    \qmltype UbuntuListView
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \inherits ListView
+    \brief A ListView with special features tailored for a look and feel fitting the
+    Ubuntu Touch platform.
+    The UbuntuListView works just like a regular ListView, but it adds special features
+    such as expanding/collapsing items (when used together with the Expandable item).
+    It provides features like automatically positioning the expanding item when it
+    expands and collapsing it again when the user taps outside of it.
+
+    Examples:
+    \qml
+        import Ubuntu.Components 1.3
+        import Ubuntu.Components.ListItems 1.3 as ListItem
+
+        Item {
+            ListModel {
+                id: listModel
+            }
+
+            UbuntuListView {
+                id: ubuntuListView
+                anchors { left: parent.left; right: parent.right }
+                height: units.gu(24)
+                model: listModel
+
+                delegate: ListItem.Expandable {
+                    id: expandingItem
+
+                    expandedHeight: units.gu(30)
+
+                    onClicked: {
+                        ubuntuListView.expandedIndex = index;
+                    }
+                }
+            }
+        }
+    \endqml
+*/
+
+ListView {
+    id: root
+
+    /*!
+      \deprecated
+      The index of the currently expanded item. -1 if no item is expanded.
+      \b {THIS PROPERTY IS DEPRECATED. USE THE NEW ListItem TO HANDLE EXPANSION}
+     */
+    property int expandedIndex: -1
+
+    /*!
+      \qmlproperty pullToRefresh UbuntuListView::pullToRefresh
+      \readonly
+      \since Ubuntu.Components 1.1
+
+      Attached PullToRefresh to control manual model refresh. The component is disabled
+      by default.
+
+      \qml
+      import QtQuick 2.4
+      import Ubuntu.Components 1.3
+
+      UbuntuListView {
+          width: units.gu(40)
+          height: units.gu(71)
+          model: XmlListModel {
+              source: "http://feeds.reuters.com/reuters/topNews"
+              query: "/rss/channel/item"
+              XmlRole { name: "title"; query: "title/string()" }
+          }
+          // let refresh control know when the refresh gets completed
+          pullToRefresh {
+              enable: true
+              refreshing: model.status === XmlListModel.Loading
+              onRefresh: model.reload()
+          }
+          delegate: ListItem {
+              ListItemLayout {
+                  title.text: modelData
+              }
+              onClicked: {
+                  ListView.view.model.reload();
+              }
+          }
+      }
+      \endqml
       */
-    property alias pullToRefresh: refreshItem
+    readonly property alias pullToRefresh: refreshItem
 
     PullToRefresh {
         objectName: "listview_pulltorefresh"
         id: refreshItem
         enabled: false
     }
+
+    QtObject {
+        id: priv
+
+        function positionViewAtIndexAnimated(expandedIndex) {
+            animation.from = root.contentY;
+            root.currentIndex = expandedIndex;
+            if (expandedIndex == root.count - 1) {
+                root.positionViewAtIndex(expandedIndex, ListView.End);
+            } else {
+                root.positionViewAtIndex(expandedIndex + 1, ListView.End);
+            }
+
+            var effectiveExpandedHeight = Math.min(root.currentItem.expandedHeight, root.height - root.currentItem.collapsedHeight);
+            if (root.contentY - root.originY == 0) {
+                if (((root.currentIndex + 1) * root.currentItem.collapsedHeight) + effectiveExpandedHeight > root.height) {
+                    animation.to = ((root.currentIndex + 1) * root.currentItem.collapsedHeight + effectiveExpandedHeight) - root.height + root.originY
+                } else {
+                    animation.to = root.originY
+                }
+            } else {
+                animation.to = root.contentY + (effectiveExpandedHeight - root.currentItem.collapsedHeight);
+            }
+            animation.start();
+        }
+
+        function requestFocus(reason) {
+            // lookup for the currentItem, and if it is a FocusScope, focus the view
+            // this will also focus the currentItem
+            if (root.currentItem && root.currentItem.hasOwnProperty("activeFocusOnPress")) {
+                // is the currentItem a ListItem?
+                if (QuickUtils.inherits(root.currentItem, "UCListItem")) {
+                    root.currentItem.requestFocus(reason);
+                } else {
+                    root.forceActiveFocus(reason);
+                }
+            }
+        }
+    }
+
+    focus: true
+
+    /*!
+      \internal
+      Grab focus when moved, flicked or clicked
+     */
+    onMovementStarted: priv.requestFocus(Qt.MouseFocusReason)
+    onFlickStarted: priv.requestFocus(Qt.MouseFocusReason)
+    Toolkit.Mouse.onClicked: priv.requestFocus(Qt.MouseFocusReason)
+
+    /*!
+      Expand the item at the given index.
+     */
+    onExpandedIndexChanged: {
+        if (expandedIndex < 0) {
+            return;
+        }
+        priv.positionViewAtIndexAnimated(expandedIndex, ListView.End)
+    }
+
+    UbuntuNumberAnimation {
+        id: animation
+        target: root
+        property: "contentY"
+    }
+
+    MouseArea {
+        parent: contentItem
+        anchors.fill: parent
+        z: 2
+        enabled: root.expandedIndex != -1
+        onClicked: root.expandedIndex = -1;
+    }
+
+    // animate move displaced
+    moveDisplaced: Transition {
+        UbuntuNumberAnimation {
+            properties: "x,y"
+        }
+    }
+
+    // highlight current item
+    highlight: Rectangle {
+        color: theme.palette.selected.background
+    }
+    highlightMoveDuration: 0
 }

=== removed file 'src/Ubuntu/Components/1.3/UbuntuListView11.qdoc'
--- src/Ubuntu/Components/1.3/UbuntuListView11.qdoc	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView11.qdoc	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*!
-  \qmlproperty pullToRefresh UbuntuListView::pullToRefresh
-  \readonly
-  \since Ubuntu.Components 1.1
-
-  Attached PullToRefresh to control manual model refresh. The component is disabled
-  by default.
-
-  \qml
-  import QtQuick 2.4
-  import Ubuntu.Components 1.2
-  import Ubuntu.Components.ListItems 1.0
-
-  UbuntuListView {
-      width: units.gu(40)
-      height: units.gu(71)
-      model: XmlListModel {
-          source: "http://feeds.reuters.com/reuters/topNews"
-          query: "/rss/channel/item"
-          XmlRole { name: "title"; query: "title/string()" }
-      }
-      // let refresh control know when the refresh gets completed
-      pullToRefresh {
-          enable: true
-          refreshing: model.status === XmlListModel.Loading
-          onRefresh: model.reload()
-      }
-      delegate: ListItem.Standard {
-          width: ListView.view.width
-          height: units.gu(5)
-          text: modelData
-          onClicked: {
-              ListView.view.model.reload();
-          }
-      }
-  }
-  \endqml
-  */

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-01-08 17:10:46 +0000
@@ -124,7 +124,6 @@
              1.3/ToolbarItems.qml \
              1.3/tree.js \
              1.3/UbuntuColors.qml \
-             1.3/UbuntuListView11.qml \
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
              1.3/ListItemPopover.qml \
@@ -136,7 +135,6 @@
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \
-             1.3/UbuntuListView11.qdoc \
              1.3/PageHeadConfiguration.qdoc \
              1.3/MainView.qdoc \
              1.3/Icon.qdoc

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2015-12-16 07:59:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-01-08 17:10:46 +0000
@@ -24,7 +24,7 @@
 
     anchors.fill: parent
     anchors.margins: -units.gu(0.4)
-    backgroundColor: Qt.rgba(focusColor.r, focusColor.g, focusColor.b, 0.8)
+    backgroundColor: Qt.rgba(focusColor.r, focusColor.g, focusColor.b, 1.0)
     visible: styledItem.keyNavigationFocus
     z: styledItem.z - 1
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-12-08 22:05:42 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-01-08 17:10:46 +0000
@@ -44,6 +44,15 @@
      */
     property color titleColor: headerStyle.config.foregroundColor
 
+    /*!
+      The background color of the header.
+     */
+    property color backgroundColor: styledItem.backgroundColor
+    Rectangle {
+        anchors.fill: parent
+        color: headerStyle.backgroundColor
+    }
+
     // FIXME: When the three panel color properties below are removed,
     //  update unity8/Dash/PageHeader to use the new theming (currently
     //  in progress) to set these colors.

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-12-11 08:38:42 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-01-08 17:10:46 +0000
@@ -92,8 +92,10 @@
     }
 
     Component.onDestruction: {
-        rootItem.__propagated.header.visibleChanged.disconnect(fixTopMargin);
-        rootItem.__propagated.header.heightChanged.disconnect(fixTopMargin);
+        if (rootItem && rootItem.__propagated && rootItem.__propagated.header) {
+            rootItem.__propagated.header.visibleChanged.disconnect(fixTopMargin);
+            rootItem.__propagated.header.heightChanged.disconnect(fixTopMargin);
+        }
     }
 
     function fixTopMargin() {

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-12-08 10:54:31 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-01-08 17:10:46 +0000
@@ -71,13 +71,15 @@
 #include "uclabel.h"
 #include "uclistitemlayout.h"
 #include "ucbottomedgehint.h"
-#include "gestures/ucswipearea.h"
 #include "ucmathutils.h"
 #include "ucbottomedge.h"
 #include "ucbottomedgeregion.h"
 #include "ucbottomedgestyle.h"
 #include "ucpagetreenode.h"
 
+// From UbuntuGestures
+#include "private/ucswipearea_p.h"
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdexcept>

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-12-15 15:58:54 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-01-08 17:10:46 +0000
@@ -3,7 +3,7 @@
     PKGCONFIG += gio-2.0 dbus-1 libnih-dbus
 }
 
-QT *= core-private qml qml-private quick quick-private gui-private dbus svg UbuntuGestures
+QT *= core-private qml qml-private quick quick-private gui-private dbus svg UbuntuGestures UbuntuGestures_private
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT += v8-private
@@ -98,8 +98,6 @@
     $$PWD/ucimportversionchecker_p.h \
     $$PWD/ucbottomedgehint.h \
     $$PWD/ucbottomedgehint_p.h \
-    $$PWD/gestures/ucswipearea.h \
-    $$PWD/gestures/ucswipearea_p.h \
     $$PWD/gestures/damper.h \
     $$PWD/gestures/ubuntugesturesqmlglobal.h \
     $$PWD/ucmathutils.h \
@@ -174,7 +172,6 @@
     $$PWD/privates/threelabelsslot_p.cpp \
     $$PWD/ucimportversionchecker_p.cpp \
     $$PWD/ucbottomedgehint.cpp \
-    $$PWD/gestures/ucswipearea.cpp \
     $$PWD/ucmathutils.cpp \
     $$PWD/ucbottomedge.cpp \
     $$PWD/ucbottomedgestyle.cpp \

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2015-11-08 21:39:34 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-01-08 17:10:46 +0000
@@ -38,7 +38,10 @@
 void UCThreeLabelsSlotPrivate::setTitleProperties()
 {
     if (m_title != Q_NULLPTR) {
-        m_title->setWrapMode(UCLabel::WordWrap);
+        //Using WrapAnywhere because ElideRight elides too early when used
+        //together with WrapWord, and that produces an unexpected result.
+        //This will cover most of the usecases.
+        m_title->setWrapMode(UCLabel::WrapAnywhere);
         m_title->setElideMode(UCLabel::ElideRight);
         m_title->setMaximumLineCount(1);
         m_title->setTextSize(UCLabel::Medium);
@@ -48,7 +51,7 @@
 void UCThreeLabelsSlotPrivate::setSubtitleProperties()
 {
     if (m_subtitle != Q_NULLPTR) {
-        m_subtitle->setWrapMode(UCLabel::WordWrap);
+        m_subtitle->setWrapMode(UCLabel::WrapAnywhere);
         m_subtitle->setElideMode(UCLabel::ElideRight);
         m_subtitle->setMaximumLineCount(1);
         m_subtitle->setTextSize(UCLabel::Small);
@@ -58,7 +61,7 @@
 void UCThreeLabelsSlotPrivate::setSummaryProperties()
 {
     if (m_summary != Q_NULLPTR) {
-        m_summary->setWrapMode(UCLabel::WordWrap);
+        m_summary->setWrapMode(UCLabel::WrapAnywhere);
         m_summary->setElideMode(UCLabel::ElideRight);
         m_summary->setMaximumLineCount(2);
         m_summary->setTextSize(UCLabel::Small);
@@ -99,19 +102,19 @@
         QQuickAnchors *subtitleAnchors = QQuickItemPrivate::get(m_subtitle)->anchors();
         subtitleAnchors->setTop(skipTitle
                                 ? top()
-                                : QQuickItemPrivate::get(m_title)->baseline());
+                                : QQuickItemPrivate::get(m_title)->bottom());
         subtitleAnchors->setTopMargin(skipTitle
                                       ? 0
-                                      : UCUnits::instance().dp(LABELSBLOCK_SPACING_DP));
+                                      : UCUnits::instance().dp(TITLE_SPACING_DP));
     }
 
     if (!skipSummary) {
         QQuickAnchors *summaryAnchors = QQuickItemPrivate::get(m_summary)->anchors();
         summaryAnchors->setTop(skipSubtitle
-                               ? (skipTitle ? top() : QQuickItemPrivate::get(m_title)->baseline())
+                               ? (skipTitle ? top() : QQuickItemPrivate::get(m_title)->bottom())
                                : QQuickItemPrivate::get(m_subtitle)->bottom());
         summaryAnchors->setTopMargin(skipSubtitle
-                                     ? (skipTitle ? 0 : UCUnits::instance().dp(LABELSBLOCK_SPACING_DP))
+                                     ? (skipTitle ? 0 : UCUnits::instance().dp(TITLE_SPACING_DP))
                                      : 0);
     }
     //Update height of the labels box

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h	2015-10-01 08:47:31 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h	2016-01-08 17:10:46 +0000
@@ -20,7 +20,9 @@
 #include <QQuickItem>
 #include <private/qquickitem_p.h>
 
-#define LABELSBLOCK_SPACING_DP                       4
+//The padding between title and the string below it (i.e. subtitle, or
+//summary, when subtitle is empty)
+#define TITLE_SPACING_DP                       2
 
 class UCLabel;
 class UCThreeLabelsSlotPrivate;

=== modified file 'src/Ubuntu/Components/plugin/quickutils.cpp'
--- src/Ubuntu/Components/plugin/quickutils.cpp	2015-12-07 09:07:00 +0000
+++ src/Ubuntu/Components/plugin/quickutils.cpp	2016-01-08 17:10:46 +0000
@@ -33,7 +33,8 @@
 QuickUtils::QuickUtils(QObject *parent) :
     QObject(parent),
     m_rootView(0),
-    m_mouseAttached(false)
+    m_mouseAttached(false),
+    m_keyboardAttached(false)
 {
     QGuiApplication::instance()->installEventFilter(this);
     m_omitIM << "ibus" << "none" << "compose";

=== modified file 'src/Ubuntu/Components/plugin/quickutils.h'
--- src/Ubuntu/Components/plugin/quickutils.h	2015-11-05 13:41:35 +0000
+++ src/Ubuntu/Components/plugin/quickutils.h	2016-01-08 17:10:46 +0000
@@ -32,6 +32,7 @@
     Q_PROPERTY(QString inputMethodProvider READ inputMethodProvider)
     Q_PROPERTY(bool touchScreenAvailable READ touchScreenAvailable NOTIFY touchScreenAvailableChanged)
     Q_PROPERTY(bool mouseAttached MEMBER m_mouseAttached NOTIFY mouseAttachedChanged)
+    Q_PROPERTY(bool keyboardAttached MEMBER m_keyboardAttached NOTIFY keyboardAttachedChanged)
 public:
     static QuickUtils& instance()
     {
@@ -53,6 +54,10 @@
     {
         return m_mouseAttached;
     }
+    bool keyboardAttached()
+    {
+        return m_keyboardAttached;
+    }
 
 Q_SIGNALS:
     void rootObjectChanged();
@@ -60,6 +65,7 @@
     void deactivated();
     void touchScreenAvailableChanged();
     void mouseAttachedChanged();
+    void keyboardAttachedChanged();
 
 protected:
     bool eventFilter(QObject *, QEvent *);
@@ -69,6 +75,7 @@
     QPointer<QQuickView> m_rootView;
     QStringList m_omitIM;
     bool m_mouseAttached;
+    bool m_keyboardAttached;
 
     void lookupQuickView();
 };

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-12-13 07:48:56 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2016-01-08 17:10:46 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "ucaction.h"
+#include "quickutils.h"
 
 #include <QtDebug>
 #include <QtQml/QQmlInfo>
@@ -22,6 +23,30 @@
 #include <QtQuick/qquickwindow.h>
 #include <private/qguiapplication_p.h>
 
+bool shortcutContextMatcher(QObject* object, Qt::ShortcutContext context)
+{
+    UCAction* action = static_cast<UCAction*>(object);
+    // Can't access member here because it's not public
+    if (!action->property("enabled").toBool())
+        return false;
+
+    switch (context) {
+    case Qt::ApplicationShortcut:
+        return true;
+    case Qt::WindowShortcut: {
+        QObject* window = object;
+        while (window && !window->isWindowType()) {
+            window = window->parent();
+            if (QQuickItem* item = qobject_cast<QQuickItem*>(window))
+                window = item->window();
+        }
+        return window && window == QGuiApplication::focusWindow();
+    }
+    default: break;
+    }
+    return false;
+}
+
 /*!
  * \qmltype Action
  * \instantiates UCAction
@@ -74,6 +99,20 @@
  * as well as to define actions for pages, or when defining options in \c ListItemOptions.
  *
  * Examples: See \l Page
+ *
+ * \section2 Mnemonics
+ * Since Ubuntu.Components 1.3 Action supports mnemonics. Mnemonics are shortcuts
+ * defined in the \l text property, prefixed the shortcut letter with \&. For instance
+ * \c "\&Call" will bint the \c "Alt-C" shortcut to the action. When a mnemonic
+ * is detected on the Action and a keyboard is attached to the device, the \l text
+ * property will provide a formatted text having the mnemonic letter underscored.
+ * \qml
+ * Action {
+ *     id: call
+ *     iconName: "call"
+ *     text: "&Call"
+ * }
+ * \endqml
  */
 
 /*!
@@ -94,7 +133,69 @@
 /*!
  * \qmlproperty string Action::text
  * The user visible primary label of the action.
+ *
+ * Mnemonics are shortcuts prefixed in the text with \&. If the text has multiple
+ * occurences of the \& character, the first one will be considered for the shortcut.
+ * The \& character cannot be used as shortcut.
  */
+QString UCAction::text()
+{
+    // if we have a mnemonic, underscore it
+    if (!m_mnemonic.isEmpty()) {
+
+        QString mnemonic = "&" + m_mnemonic.toString().remove("Alt+");
+        // patch special cases
+        mnemonic.replace("Space", " ");
+        int mnemonicIndex = m_text.indexOf(mnemonic);
+        if (mnemonicIndex < 0) {
+            // try lower case
+            mnemonic = mnemonic.toLower();
+            mnemonicIndex = m_text.indexOf(mnemonic);
+        }
+        QString displayText(m_text);
+        // FIXME: we need QInputDeviceInfo to detect the keyboard attechment
+        // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
+        if (QuickUtils::instance().keyboardAttached()) {
+            // underscore the character
+            displayText.replace(mnemonicIndex, mnemonic.length(), "<u>" + mnemonic[1] + "</u>");
+        } else {
+            displayText.remove(mnemonicIndex, 1);
+        }
+        return displayText;
+    }
+    return m_text;
+}
+void UCAction::setText(const QString &text)
+{
+    if (m_text == text) {
+        return;
+    }
+    m_text = text;
+    setMnemonicFromText(m_text);
+    Q_EMIT textChanged();
+}
+void UCAction::resetText()
+{
+    setText(QString());
+}
+
+void UCAction::setMnemonicFromText(const QString &text)
+{
+    QKeySequence sequence = QKeySequence::mnemonic(text);
+    if (sequence == m_mnemonic) {
+        return;
+    }
+    if (!m_mnemonic.isEmpty()) {
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(0, this, m_mnemonic);
+    }
+
+    m_mnemonic = sequence;
+
+    if (!m_mnemonic.isEmpty()) {
+        Qt::ShortcutContext context = Qt::WindowShortcut;
+        QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(this, m_mnemonic, context, shortcutContextMatcher);
+    }
+}
 
 /*!
  * \qmlproperty string Action::keywords
@@ -158,11 +259,16 @@
     , m_published(false)
 {
     generateName();
+    // FIXME: we need QInputDeviceInfo to detect the keyboard attechment
+    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1276808
+    connect(&QuickUtils::instance(), &QuickUtils::keyboardAttachedChanged,
+            this, &UCAction::onKeyboardAttached);
 }
 
 UCAction::~UCAction()
 {
     resetShortcut();
+    resetText();
 }
 
 bool UCAction::isValidType(QVariant::Type valueType)
@@ -249,22 +355,6 @@
     qWarning() << "Action.itemHint is a DEPRECATED property. Use ActionItems to specify the representation of an Action.";
 }
 
-bool shortcutContextMatcher(QObject* object, Qt::ShortcutContext)
-{
-    UCAction* action = static_cast<UCAction*>(object);
-    // Can't access member here because it's not public
-    if (!action->property("enabled").toBool())
-        return false;
-
-    QObject* window = object;
-    while (window && !window->isWindowType()) {
-        window = window->parent();
-        if (QQuickItem* item = qobject_cast<QQuickItem*>(window))
-            window = item->window();
-    }
-    return window && window == QGuiApplication::focusWindow();
-}
-
 QKeySequence sequenceFromVariant(const QVariant& variant) {
     if (variant.type() == QVariant::Int)
         return static_cast<QKeySequence::StandardKey>(variant.toInt());
@@ -320,6 +410,14 @@
     return true;
 }
 
+// trigger text changes whenever HW keyboad is attached/detached
+void UCAction::onKeyboardAttached()
+{
+    if (!m_mnemonic.isEmpty()) {
+        Q_EMIT textChanged();
+    }
+}
+
 /*!
  * \qmlmethod Action::trigger(var value)
  * Checks the \c value against the action \l parameterType and triggers the action.

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-12-14 06:15:16 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2016-01-08 17:10:46 +0000
@@ -20,6 +20,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 #include <QtCore/QUrl>
+#include <QtGui/QKeySequence>
 
 // the function detects whether QML has an overridden trigger() slot available
 // and invokes the one with the appropriate signature
@@ -51,7 +52,7 @@
     // transferred from Unity Actions
     Q_ENUMS(Type)
     Q_PROPERTY(QString name MEMBER m_name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QString text MEMBER m_text NOTIFY textChanged)
+    Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
     Q_PROPERTY(QString iconName MEMBER m_iconName WRITE setIconName NOTIFY iconNameChanged)
     Q_PROPERTY(QString description MEMBER m_description NOTIFY descriptionChanged)
     Q_PROPERTY(QString keywords MEMBER m_keywords NOTIFY keywordsChanged)
@@ -84,6 +85,9 @@
     }
 
     void setName(const QString &name);
+    QString text();
+    void setText(const QString &text);
+    void resetText();
     void setIconName(const QString &name);
     void setIconSource(const QUrl &url);
     void setItemHint(QQmlComponent *);
@@ -114,6 +118,7 @@
     QString m_description;
     QString m_keywords;
     QVariant m_shortcut;
+    QKeySequence m_mnemonic;
     QQmlComponent *m_itemHint;
     Type m_parameterType;
     bool m_factoryIconSource:1;
@@ -130,7 +135,9 @@
 
     bool isValidType(QVariant::Type valueType);
     void generateName();
+    void setMnemonicFromText(const QString &text);
     bool event(QEvent *event);
+    void onKeyboardAttached();
 };
 
 #endif // UCACTION_H

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-12-14 07:21:44 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-01-08 17:10:46 +0000
@@ -34,7 +34,7 @@
 #include "ucheader.h"
 #include "ucaction.h"
 #include "quickutils.h"
-#include "gestures/ucswipearea.h"
+#include "private/ucswipearea_p.h"
 #include <QtQuick/private/qquickanimation_p.h>
 
 Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-12-14 16:05:03 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2016-01-08 17:10:46 +0000
@@ -23,7 +23,7 @@
 #include "ucnamespace.h"
 #include "ucunits.h"
 #include "ucaction.h"
-#include "gestures/ucswipearea.h"
+#include "private/ucswipearea_p.h"
 #include "propertychange_p.h"
 #include <QtQml/private/qqmlproperty_p.h>
 #include <QtQuick/private/qquickflickable_p.h>

=== modified file 'src/Ubuntu/Components/plugin/ucfontutils.h'
--- src/Ubuntu/Components/plugin/ucfontutils.h	2015-09-22 14:39:47 +0000
+++ src/Ubuntu/Components/plugin/ucfontutils.h	2016-01-08 17:10:46 +0000
@@ -26,12 +26,12 @@
 
 public:
     static constexpr float fontUnits = 14.0f;
-    static constexpr float xxSmallScale = 0.677f;
-    static constexpr float xSmallScale = 0.804f;
-    static constexpr float smallScale = 0.931f;
-    static constexpr float mediumScale = 1.079f;
-    static constexpr float largeScale = 1.291f;
-    static constexpr float xLargeScale = 1.714f;
+    static constexpr float xxSmallScale = 0.606f;
+    static constexpr float xSmallScale = 0.707f;
+    static constexpr float smallScale = 0.857f;
+    static constexpr float mediumScale = 1.0f;
+    static constexpr float largeScale = 1.414f;
+    static constexpr float xLargeScale = 1.905f;
 
     static UCFontUtils& instance()
     {

=== modified file 'src/Ubuntu/Components/plugin/uclistitemlayout.cpp'
--- src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2015-11-10 11:39:51 +0000
+++ src/Ubuntu/Components/plugin/uclistitemlayout.cpp	2016-01-08 17:10:46 +0000
@@ -27,6 +27,7 @@
     \qmltype ListItemLayout
     \instantiates UCListItemLayout
     \inqmlmodule Ubuntu.Components 1.3
+    \since Ubuntu.Components 1.3
     \inherits SlotsLayout
     \ingroup ubuntu
 
@@ -74,7 +75,7 @@
     \l ListItem and ListItemLayout:
     \qml
     ListItem {
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
         ListItemLayout {
             id: layout
             title.text: "Hello developers!"
@@ -103,7 +104,7 @@
     \qml
     ListItem {
         id: listItem
-        height: layout.height + divider.height
+        height: layout.height + (divider.visible ? divider.height : 0)
 
         ListItemLayout {
             id: layout
@@ -155,8 +156,8 @@
     The \l title is positioned at the top, followed by \l subtitle and \l summary,
     respectively.
 
-    The \l subtitle has its top anchored to \l {title}'s baseline, with a margin of
-    4 DPs.
+    The \l subtitle has its top anchored to \l {title}'s bottom, with a margin of
+    2 DPs.
 
     The \l summary has its top tightly anchored to \l {subtitle}'s bottom.
 
@@ -208,6 +209,81 @@
     }
     \endqml
 
+    \section1 About aliasing labels properties
+    Due to the way ListItemsLayout's labels are created (see
+    \l {Optimizing memory consumption}) it is not possible to
+    directly alias their properties. It is still possible, however,
+    to expose an API that gives indirect read-write access to those
+    properties.
+    The following code:
+
+    \qml
+    ListItem {
+        property alias titleText: layout.title.text
+        ListItemLayout {
+            id: layout
+        }
+    }
+    \endqml
+
+    will return the error "Invalid alias location", because
+    the title object does not yet exist at time when the alias
+    is created.
+
+    If you need to expose an API for your component that allows
+    changing the properties of the labels, we recommend aliasing
+    the labels themselves. Let's assume you want to create a
+    QML component to use as a delegate of many
+    list views inside your application: you will probably have a qml
+    file holding the definition of the that delegate, and the content
+    of that file will be similar to:
+    \qml
+    //Content of CustomListItem.qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+
+    ListItem {
+        id: listitem
+        property alias title: layout.title
+        property alias iconName: icon.name
+
+        height: layout.height + (divider.visible ? divider.height : 0)
+
+        ListItemLayout {
+            id: layout
+            Icon {
+                id: icon
+                width: units.gu(2)
+            }
+        }
+    }
+    \endqml
+
+    As you can see, we alias the label item itself instead of its
+    properties. This also has the advantage of only exposing one alias
+    instead of one for each property, thus making your QML app a bit more performant.
+    Once your delegate is defined, you can use it in your ListViews like usual.
+    \qml
+    //other UI code...
+
+    ListView {
+        anchors.fill: parent
+        model: ListModel {
+            id: listViewModel
+            ListElement { titleText: "Hello1"; icon: "message" }
+            ListElement { titleText: "Hello2"; icon: "email" }
+            ListElement { titleText: "Hello3"; icon: "email" }
+            ListElement { titleText: "Hello4"; icon: "message" }
+        }
+        delegate: CustomListItem {
+            title.text: model.titleText
+            iconName: model.icon
+        }
+    }
+    \endqml
+
+    Note how title's properties are all accessible via the "title" identifier.
+
 */
 UCListItemLayout::UCListItemLayout(QQuickItem *parent)
     : UCSlotsLayout(parent)

=== modified file 'src/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
--- src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2015-10-15 08:43:17 +0000
+++ src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2016-01-08 17:10:46 +0000
@@ -77,16 +77,19 @@
     int separatorPosition = resolved.indexOf("/");
     QString scaleFactor = resolved.left(separatorPosition);
     QString selectedFilePath = resolved.mid(separatorPosition+1);
+    QString fragment(m_source.hasFragment() ? "#" + m_source.fragment() : QString(""));
 
     if (scaleFactor == "1") {
         if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)
                 || selectedFilePath.endsWith(".svg") || selectedFilePath.endsWith(".svgz")) {
-            // No scaling necessary. Just pass the file as is.
-            m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
+            // Take care to pass the original fragment
+            QUrl selectedFileUrl(QUrl::fromLocalFile(selectedFilePath));
+            selectedFileUrl.setFragment(fragment);
+            m_image->setSource(selectedFileUrl);
         } else {
             // Need to scale the pixel-based image to suit the devicePixelRatio setting ourselves.
             // If we let Qt do it, Qt will not choose the UITK-supported "@gu" scaled images.
-            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath));
+            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath + fragment));
             // explicitly set the source size in the QQuickImageBase, this persuades it that the
             // supplied image is suitable for the current devicePixelRatio.
             m_image->setSourceSize(m_image->sourceSize());
@@ -95,7 +98,7 @@
         // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
         if (!m_source.path().endsWith(".sci")) {
             // Regular image file
-            m_image->setSource(QUrl("image://scaling/" + resolved));
+            m_image->setSource(QUrl("image://scaling/" + resolved + fragment));
         } else {
             // .sci image file. Rewrite the .sci file into a temporary file.
             bool rewritten = true;
@@ -124,7 +127,10 @@
             }
 
             if (rewritten) {
-                m_image->setSource(QUrl::fromLocalFile(rewrittenSciFile->fileName()));
+                // Take care to pass the original fragment
+                QUrl rewrittenSciFileUrl(QUrl::fromLocalFile(rewrittenSciFile->fileName()));
+                rewrittenSciFileUrl.setFragment(fragment);
+                m_image->setSource(rewrittenSciFileUrl);
             } else {
                 m_image->setSource(m_source);
             }

=== modified file 'src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp'
--- src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2014-09-30 12:10:46 +0000
+++ src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2016-01-08 17:10:46 +0000
@@ -40,7 +40,9 @@
 {
     int separatorPosition = id.indexOf("/");
     float scaleFactor = id.left(separatorPosition).toFloat();
-    QString path = id.mid(separatorPosition+1);
+    int fragmentPosition = id.lastIndexOf("#");
+    int pathLength = fragmentPosition > -1 ? fragmentPosition - separatorPosition - 1 : -1;
+    QString path = id.mid(separatorPosition + 1, pathLength);
     QFile file(path);
 
     if (file.open(QIODevice::ReadOnly)) {

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/qmldir	2016-01-08 17:10:46 +0000
@@ -130,7 +130,7 @@
 OrientationHelper 1.3 1.3/OrientationHelper.qml
 UbuntuNumberAnimation 1.3 1.3/UbuntuNumberAnimation.qml
 PullToRefresh 1.3 1.3/PullToRefresh.qml
-UbuntuListView 1.3 1.3/UbuntuListView11.qml
+UbuntuListView 1.3 1.3/UbuntuListView.qml
 Captions 1.3 1.3/Captions.qml
 internal ColorUtils 1.3/colorUtils.js
 DateUtils 1.3 1.3/dateUtils.js

=== modified file 'src/Ubuntu/Test/plugin/plugin.pri'
--- src/Ubuntu/Test/plugin/plugin.pri	2015-10-21 08:33:21 +0000
+++ src/Ubuntu/Test/plugin/plugin.pri	2016-01-08 17:10:46 +0000
@@ -1,4 +1,4 @@
-QT *= core-private qml qml-private quick quick-private gui-private testlib
+QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT *= v8-private
@@ -7,6 +7,7 @@
 CONFIG  += no_keywords
 DEFINES += UBUNTU_QML_IMPORT_PATH='\\"$${ROOT_BUILD_DIR}/qml\\"'
 DEFINES += QT_USE_QSTRINGBUILDER
+INCLUDEPATH += ../UbuntuGestures
 
 TARGET = $$qtLibraryTarget($$TARGET)
 uri = Ubuntu.Test

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
--- src/Ubuntu/Test/plugin/uctestextras.cpp	2015-11-25 07:44:10 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.cpp	2016-01-08 17:10:46 +0000
@@ -17,7 +17,11 @@
 #include "uctestextras.h"
 #include "uctestcase.h"
 
+#include "ucswipearea_p.h"
+#include "ucswipearea_p_p.h"
+
 #include <qpa/qwindowsysteminterface.h>
+#include <private/qobject_p.h>
 #include <QSysInfo>
 
 const char *DEVICE_MISSING_MSG = "No touch device registered. Register one using registerTouchDevice() before using %1";
@@ -375,3 +379,17 @@
     }
     QTest::mouseRelease(item->window(), button, stateKey, movePoint, delay);
 }
+
+
+void UCTestExtras::removeTimeConstraintsFromSwipeArea(QQuickItem *item)
+{
+    UCSwipeArea *swipeArea = dynamic_cast<UCSwipeArea*>(item);
+    if (!swipeArea) {
+        qWarning() << item << "is not a SwipeArea";
+        return;
+    }
+
+    UCSwipeAreaPrivate *priv = static_cast<UCSwipeAreaPrivate *>(QObjectPrivate::get(swipeArea));
+    priv->setMaxTime(60 * 60 * 1000);
+    priv->setCompositionTime(0);
+}

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.h'
--- src/Ubuntu/Test/plugin/uctestextras.h	2015-11-24 15:23:02 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.h	2016-01-08 17:10:46 +0000
@@ -46,6 +46,8 @@
 
     static void mouseDrag(QQuickItem *item, const QPoint &from, const QPoint &delta, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int steps = -1, int delay = -1);
 
+    static void removeTimeConstraintsFromSwipeArea(QQuickItem *item);
+
 public: // yet for cpp use
     static void touchDragWithPoints(int touchId, QQuickItem *item, QList<QPoint> points, int delay = -1);
     static void mouseDragWithPoints(QQuickItem *item, QList<QPoint> points, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int delay = -1);

=== modified file 'src/Ubuntu/UbuntuGestures/UbuntuGestures.pro'
--- src/Ubuntu/UbuntuGestures/UbuntuGestures.pro	2015-11-17 13:01:00 +0000
+++ src/Ubuntu/UbuntuGestures/UbuntuGestures.pro	2016-01-08 17:10:46 +0000
@@ -21,6 +21,10 @@
            unownedtouchevent.h \
            ubuntugesturesglobal.h \
            pool.h \
+           ucswipearea_p.h \
+           ucswipearea_p_p.h \
+           damper.h \
+
 
 SOURCES += candidateinactivitytimer.cpp \
            debughelpers.cpp \
@@ -29,3 +33,5 @@
            touchownershipevent.cpp \
            touchregistry.cpp \
            unownedtouchevent.cpp \
+           ucswipearea.cpp \
+           damper.cpp \
\ No newline at end of file

=== renamed file 'src/Ubuntu/Components/plugin/gestures/damper.cpp' => 'src/Ubuntu/UbuntuGestures/damper.cpp'
--- src/Ubuntu/Components/plugin/gestures/damper.cpp	2015-10-21 08:33:21 +0000
+++ src/Ubuntu/UbuntuGestures/damper.cpp	2016-01-08 17:10:46 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Damper.h"
+#include "damper_p.h"
 #include <QDebug>
 
 QDebug operator<<(QDebug dbg, const DampedPointF &p)

=== renamed file 'src/Ubuntu/Components/plugin/gestures/damper.h' => 'src/Ubuntu/UbuntuGestures/damper_p.h'
=== renamed file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp' => 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp	2015-12-16 09:52:31 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-01-08 17:10:46 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-#include "ucswipearea_p.h"
+#include "ucswipearea_p_p.h"
 
 #include <QQuickWindow>
 #include <QtCore/qmath.h>
@@ -71,19 +71,19 @@
 
     switch (ev->type()) {
     case QEvent::TouchBegin:
-        message.append("TouchBegin ");
+        message.append(QStringLiteral("TouchBegin "));
         break;
     case QEvent::TouchUpdate:
-        message.append("TouchUpdate ");
+        message.append(QStringLiteral("TouchUpdate "));
         break;
     case QEvent::TouchEnd:
-        message.append("TouchEnd ");
+        message.append(QStringLiteral("TouchEnd "));
         break;
     case QEvent::TouchCancel:
-        message.append("TouchCancel ");
+        message.append(QStringLiteral("TouchCancel "));
         break;
     default:
-        message.append("INVALID_TOUCH_EVENT_TYPE ");
+        message.append(QStringLiteral("INVALID_TOUCH_EVENT_TYPE "));
     }
 
     Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {
@@ -352,6 +352,36 @@
         Q_EMIT immediateRecognitionChanged(enabled);
     }
 }
+    
+/*!
+ * \qmlproperty bool SwipeArea::grabGesture
+ * If true, any gestures will be grabbed and owned by the SwipeArea as usual.
+ * If false, gestures will still be reported, but events may be grabbed by
+ * another Qml object.
+ *
+ * Defaults to true. In most cases this should not be unset.
+ */
+bool UCSwipeArea::grabGesture() const
+{
+    Q_D(const UCSwipeArea);
+    return d->grabGesture;
+}
+
+void UCSwipeArea::setGrabGesture(bool enabled)
+{
+    Q_D(UCSwipeArea);
+    if (d->grabGesture != enabled) {
+        d->grabGesture = enabled;
+
+        if (!d->grabGesture && d->status == UCSwipeAreaPrivate::Undecided) {
+            TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
+            // We still wanna know when it ends for keeping the composition time window up-to-date
+            TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
+        }
+
+        Q_EMIT grabGestureChanged(enabled);
+    }
+}
 
 bool UCSwipeArea::event(QEvent *event)
 {
@@ -401,7 +431,10 @@
             unownedTouchEvent_undecided(unownedTouchEvent);
             break;
         default: // Recognized:
-            // do nothing
+            if (!grabGesture) {
+                // Treat unowned event as if we owned it, but we are really just watching it
+                touchEvent_recognized(event);
+            }
             break;
     }
 
@@ -453,7 +486,9 @@
     }
 
     if (movedFarEnoughAlongGestureAxis()) {
-        TouchRegistry::instance()->requestTouchOwnership(touchId, q);
+        if (grabGesture) {
+            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
+        }
         setStatus(Recognized);
         updatePosition(touchScenePosition);
     } else if (isPastMaxDistance()) {
@@ -552,12 +587,21 @@
         if (recognitionIsDisabled()) {
             // Behave like a dumb TouchArea
             SA_TRACE("Gesture recognition is disabled. Requesting touch ownership immediately.");
-            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
             setStatus(Recognized);
-            event->accept();
+            if (grabGesture) {
+                TouchRegistry::instance()->requestTouchOwnership(touchId, q);
+                event->accept();
+            } else {
+                watchPressedTouchPoints(touchPoints);
+                event->ignore();
+            }
         } else {
             // just monitor the touch points for now.
-            TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
+            if (grabGesture) {
+                TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
+            } else {
+                watchPressedTouchPoints(touchPoints);
+            }
 
             setStatus(Undecided);
             // Let the item below have it. We will monitor it and grab it later if a gesture
@@ -859,7 +903,7 @@
 
 QString ActiveTouchesInfo::toString()
 {
-    QString string = "(";
+    QString string = QStringLiteral("(");
 
     {
         QTextStream stream(&string);
@@ -869,7 +913,7 @@
         });
     }
 
-    string.append(")");
+    string.append(QStringLiteral(")"));
 
     return string;
 }
@@ -981,6 +1025,7 @@
     , status(WaitingForTouch)
     , direction(UCSwipeArea::Rightwards)
     , immediateRecognition(false)
+    , grabGesture(true)
 {
 }
 

=== renamed file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.h' => 'src/Ubuntu/UbuntuGestures/ucswipearea_p.h'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea.h	2015-12-10 08:03:24 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea_p.h	2016-01-08 17:10:46 +0000
@@ -19,8 +19,7 @@
 #define UCSWIPEAREA_H
 
 #include <QtQuick/QQuickItem>
-#include "ubuntugesturesqmlglobal.h"
-#include "damper.h"
+#include "ubuntugesturesglobal.h"
 
 // lib UbuntuGestures
 #include <UbuntuGestures/Pool>
@@ -34,7 +33,7 @@
 class UCSwipeAreaPrivate;
 
 class UCSwipeAreaPrivate;
-class UBUNTUGESTURESQML_EXPORT UCSwipeArea : public QQuickItem
+class UBUNTUGESTURES_EXPORT UCSwipeArea : public QQuickItem
 {
     Q_OBJECT
 
@@ -47,6 +46,7 @@
             READ immediateRecognition
             WRITE setImmediateRecognition
             NOTIFY immediateRecognitionChanged)
+    Q_PROPERTY(bool grabGesture READ grabGesture WRITE setGrabGesture NOTIFY grabGestureChanged)
 
     Q_ENUMS(Direction)
 public:
@@ -75,6 +75,9 @@
     bool immediateRecognition() const;
     void setImmediateRecognition(bool enabled);
 
+    bool grabGesture() const;
+    void setGrabGesture(bool enabled);
+
 Q_SIGNALS:
     void directionChanged(Direction direction);
     void draggingChanged(bool dragging);
@@ -82,6 +85,7 @@
     void distanceChanged(qreal distance);
     void touchPositionChanged(const QPointF &position);
     void immediateRecognitionChanged(bool immediateRecognition);
+    void grabGestureChanged(bool grabGesture);
 
 protected:
     bool event(QEvent *e) override;

=== renamed file 'src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h' => 'src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h	2015-12-16 09:52:31 +0000
+++ src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h	2016-01-08 17:10:46 +0000
@@ -18,18 +18,20 @@
 #ifndef UCSWIPEAREAPRIVATE_H
 #define UCSWIPEAREAPRIVATE_H
 
-#include "ucswipearea.h"
+#include "ucswipearea_p.h"
 #include <QtQuick/private/qquickitem_p.h>
 
+#include "damper_p.h"
+
 // Information about an active touch point
-struct UBUNTUGESTURESQML_EXPORT ActiveTouchInfo {
+struct UBUNTUGESTURES_EXPORT ActiveTouchInfo {
     ActiveTouchInfo() : id(-1), startTime(-1) {}
     bool isValid() const { return id != -1; }
     void reset() { id = -1; }
     int id;
     qint64 startTime;
 };
-class UBUNTUGESTURESQML_EXPORT ActiveTouchesInfo {
+class UBUNTUGESTURES_EXPORT ActiveTouchesInfo {
 public:
     ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
     void update(QTouchEvent *event);
@@ -46,7 +48,7 @@
 };
 
 class UCSwipeAreaStatusListener;
-class UBUNTUGESTURESQML_EXPORT UCSwipeAreaPrivate : public QQuickItemPrivate
+class UBUNTUGESTURES_EXPORT UCSwipeAreaPrivate : public QQuickItemPrivate
 {
     Q_DECLARE_PUBLIC(UCSwipeArea)
 
@@ -71,7 +73,6 @@
     // Useful for testing, where a fake time source can be supplied
     void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
 
-public:
     // Describes the state of the directional drag gesture.
     enum Status {
         // Waiting for a new touch point to land on this area. No gesture is being processed
@@ -161,9 +162,10 @@
     UCSwipeArea::Direction direction;
 
     bool immediateRecognition;
+    bool grabGesture;
 };
 
-class UBUNTUGESTURESQML_EXPORT UCSwipeAreaStatusListener
+class UBUNTUGESTURES_EXPORT UCSwipeAreaStatusListener
 {
 public:
     virtual void swipeStatusChanged(UCSwipeAreaPrivate::Status /*old*/, UCSwipeAreaPrivate::Status /*new*/) {}

=== modified file 'tests/api/Extinct/Animals/AnimalModule.pro'
--- tests/api/Extinct/Animals/AnimalModule.pro	2015-11-30 15:39:52 +0000
+++ tests/api/Extinct/Animals/AnimalModule.pro	2016-01-08 17:10:46 +0000
@@ -8,7 +8,7 @@
 QML_FILES += \
     Andrewsarchus.qml \
     Paratriisodon.qml \
-    gigantophis.qml \
+    Gigantophis.qml \
     test.qml \
     digger.js \
 

=== renamed file 'tests/api/Extinct/Animals/gigantophis.qml' => 'tests/api/Extinct/Animals/Gigantophis.qml'
=== modified file 'tests/api/Extinct/Animals/plugin/plugin.cpp'
--- tests/api/Extinct/Animals/plugin/plugin.cpp	2015-12-11 10:38:46 +0000
+++ tests/api/Extinct/Animals/plugin/plugin.cpp	2016-01-08 17:10:46 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "plugin.h"
+#include "tarpan.h"
 #include "smilodon.h"
 #include "pangaea.h"
 #include "rune.h"
@@ -50,6 +51,7 @@
 {
     Q_ASSERT(uri == QLatin1String("Extinct.Animals"));
 
+    qmlRegisterType<EATarpan>();
     qmlRegisterType<EASmilodon>(uri, 1, 0, "Smilodon");
     qmlRegisterType<EASmilodon>(uri, 0, 1, "ScimitarCat");
 

=== modified file 'tests/api/Extinct/Animals/plugin/plugin.pri'
--- tests/api/Extinct/Animals/plugin/plugin.pri	2015-12-02 09:22:28 +0000
+++ tests/api/Extinct/Animals/plugin/plugin.pri	2016-01-08 17:10:46 +0000
@@ -13,6 +13,7 @@
 
 HEADERS += \
     $$PWD/plugin.h \
+    $$PWD/tarpan.h \
     $$PWD/smilodon.h \
     $$PWD/pangaea.h \
     $$PWD/rune.h \
@@ -21,6 +22,7 @@
 
 SOURCES += \
     $$PWD/plugin.cpp \
+    $$PWD/tarpan.cpp \
     $$PWD/smilodon.cpp \
     $$PWD/pangaea.cpp \
     $$PWD/rune.cpp \

=== added file 'tests/api/Extinct/Animals/plugin/tarpan.cpp'
--- tests/api/Extinct/Animals/plugin/tarpan.cpp	1970-01-01 00:00:00 +0000
+++ tests/api/Extinct/Animals/plugin/tarpan.cpp	2016-01-08 17:10:46 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Christian Dywan <[e-mail]>
+ */
+
+#include "tarpan.h"
+
+/*!
+ * \qmltype EATarpan
+ * \instantiates EATarpan
+ * \inqmlmodule Extinct.Animals 1.0
+ * \ingroup ubuntu-commandline
+ * \brief The Tarpan class specifies the behavior of a Eurasian wild horse.
+ */
+
+EATarpan::EATarpan(QObject *parent) :
+    QObject(parent)
+{
+}
+
+/*!
+ * \qmlproperty string EATarpan::name
+ *
+ * Name identifying the wild horse.
+ *
+ */
+QString EATarpan::name() const
+{
+    return m_name;
+}
+
+void EATarpan::setName(const QString &name)
+{
+    m_name = name;
+    Q_EMIT(nameChanged());
+}
+
+/*!
+ * \qmlmethod string EATarpan::kick()
+ *
+ * A generous kick, commonly towards someone's groin area.
+ *
+ */
+void EATarpan::kick() const
+{
+}

=== added file 'tests/api/Extinct/Animals/plugin/tarpan.h'
--- tests/api/Extinct/Animals/plugin/tarpan.h	1970-01-01 00:00:00 +0000
+++ tests/api/Extinct/Animals/plugin/tarpan.h	2016-01-08 17:10:46 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Christian Dywan <[e-mail]>
+ */
+
+#ifndef UCTARPAN_H
+#define UCTARPAN_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+class EATarpan : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+public:
+    explicit EATarpan(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &name);
+
+    Q_INVOKABLE void kick() const;
+
+Q_SIGNALS:
+    void nameChanged();
+
+private:
+    QString m_name;
+};
+
+#endif // UCTARPAN_H

=== modified file 'tests/api/Extinct/Animals/qmldir'
--- tests/api/Extinct/Animals/qmldir	2015-12-02 09:22:28 +0000
+++ tests/api/Extinct/Animals/qmldir	2016-01-08 17:10:46 +0000
@@ -1,7 +1,7 @@
 module Extinct.Animals
 plugin ExtinctAnimals
 Titanoboa 4.2 test.qml
-Gigantophis 4.3 gigantophis.qml
+Gigantophis 4.3 Gigantophis.qml
 internal WoollyMammoth mammoth.qml
 MonsterSnake 3.1 test.qml
 Excavator 1.0 digger.js

=== modified file 'tests/api/components.api'
--- tests/api/components.api	2015-12-11 10:38:46 +0000
+++ tests/api/components.api	2016-01-08 17:10:46 +0000
@@ -1,9 +1,12 @@
-Extinct.Animals.Andrewsarchus 2.0: Item
-    property double saggitalCrestSize
-    property double skullSize
-Extinct.Animals.AndrewsarchusMongoliensis 2.5: Item
-    property double saggitalCrestSize
-    property double skullSize
+Extinct.Animals.Andrewsarchus 2.0 Paratriisodon: Item
+    property double saggitalCrestSize
+    property double skullSize
+Extinct.Animals.AndrewsarchusMongoliensis 2.5 Paratriisodon: Item
+    property double saggitalCrestSize
+    property double skullSize
+EATarpan: QtObject
+    function kick()
+    property string name
 Extinct.Animals.Europe 4.1: QtObject
 Extinct.Animals.Europe 4.2: Europe
     readonly property ushort era 4.2
@@ -23,10 +26,10 @@
 Extinct.Animals.Pangaea.ModernContinent: Enum
     America
     Europe
-Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1: QtObject
+Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
     function string paw(int i)
     property string name
-Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1: Item
+Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1 test: Item
     property string bar
     property var basket
     property url bazz

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2015-05-28 15:23:13 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2016-01-08 17:10:46 +0000
@@ -48,6 +48,7 @@
     'ToolkitException',
     'ubuntu_scenarios',
     'UbuntuListView11',
+    'UbuntuListView',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -86,4 +87,5 @@
     ToolkitException,
     UbuntuUIToolkitCustomProxyObjectBase,
     UbuntuListView11,
+    UbuntuListView,
 )

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2015-09-30 14:46:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2016-01-08 17:10:46 +0000
@@ -44,6 +44,7 @@
     'Toolbar',
     'ToolkitException',
     'UbuntuListView11',
+    'UbuntuListView',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -90,5 +91,6 @@
 from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
 from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar
 from ubuntuuitoolkit._custom_proxy_objects._ubuntulistview import (
-    UbuntuListView11
+    UbuntuListView11,
+    UbuntuListView,
 )

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2015-09-22 15:56:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2016-01-08 17:10:46 +0000
@@ -45,3 +45,7 @@
             refresh.wait_for_refresh()
             return True
         return False
+
+
+class UbuntuListView(UbuntuListView11):
+    """Autopilot helper for the UbuntuListView 1.3."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2015-12-09 14:34:55 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2016-01-08 17:10:46 +0000
@@ -34,7 +34,7 @@
             text="Call")),
         ('button with color', dict(
             button_name="button_color", is_enabled=True,
-            color=[0, 161, 50, 255], icon=None, text="Call Ctrl+C")),
+            color=[0, 161, 50, 255], icon=None, text="C&all Ctrl+L")),
         ('button with icon', dict(
             button_name="button_iconsource", is_enabled=True, color=None,
             icon="call.png", text=None)),

=== modified file 'tests/uitk_test_plan.sh'
--- tests/uitk_test_plan.sh	2015-12-16 09:50:40 +0000
+++ tests/uitk_test_plan.sh	2016-01-08 17:10:46 +0000
@@ -552,3 +552,4 @@
    echo "Comparing results with the archive tests"  > $MAINFILE
    compare_results
 fi
+

=== modified file 'tests/unit/plugin_dependency.pri'
--- tests/unit/plugin_dependency.pri	2015-12-16 12:57:21 +0000
+++ tests/unit/plugin_dependency.pri	2016-01-08 17:10:46 +0000
@@ -8,7 +8,7 @@
 PRE_TARGETDEPS += $$PLUGIN_BLD/Test/libUbuntuTest.so
 LIBS += -L$$PLUGIN_BLD/Components -lUbuntuComponents
 LIBS += -L$$PLUGIN_BLD/Test -lUbuntuTest
-LIBS += -L$$PWD/../../lib -lUbuntuGestures
+LIBS += -L$${ROOT_BUILD_DIR}/lib -lUbuntuGestures
 DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
 QMAKE_CXXFLAGS += -Werror
 

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2015-12-16 09:52:31 +0000
+++ tests/unit/runtest.sh	2016-01-08 17:10:46 +0000
@@ -70,7 +70,7 @@
     $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
     if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
         ${BUILD_DIR}/tests/checkresults.sh $_XML
-        RESULT=$*
+        RESULT=$?
     fi
   else
     echo "Skipped because no DISPLAY available"

=== modified file 'tests/unit/tst_components/tst_fontutils.qml'
--- tests/unit/tst_components/tst_fontutils.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_components/tst_fontutils.qml	2016-01-08 17:10:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,12 +22,12 @@
     name: "FontUtilsAPI"
 
     function test_modularScale() {
-        compare(FontUtils.modularScale("xx-small"), 0.677, "xx-small scale");
-        compare(FontUtils.modularScale("x-small"), 0.804, "x-small scale");
-        compare(FontUtils.modularScale("small"), 0.931, "small scale");
-        compare(FontUtils.modularScale("medium"), 1.079, "medium scale");
-        compare(FontUtils.modularScale("large"), 1.291, "large scale");
-        compare(FontUtils.modularScale("x-large"), 1.714, "x-large scale");
+        compare(FontUtils.modularScale("xx-small"), 0.606, "xx-small scale");
+        compare(FontUtils.modularScale("x-small"), 0.707, "x-small scale");
+        compare(FontUtils.modularScale("small"), 0.857, "small scale");
+        compare(FontUtils.modularScale("medium"), 1.0, "medium scale");
+        compare(FontUtils.modularScale("large"), 1.414, "large scale");
+        compare(FontUtils.modularScale("x-large"), 1.905, "x-large scale");
     }
 
     function test_modularScale_failures() {
@@ -36,17 +36,16 @@
     }
 
     function test_sizeToPixels() {
-        compare(FontUtils.sizeToPixels("xx-small"), 0.677 * units.dp(14), "xx-small scale");
-        compare(FontUtils.sizeToPixels("x-small"), 0.804 * units.dp(14), "x-small scale");
-        compare(FontUtils.sizeToPixels("small"), 0.931 * units.dp(14), "small scale");
-        compare(FontUtils.sizeToPixels("medium"), 1.079 * units.dp(14), "medium scale");
-        compare(FontUtils.sizeToPixels("large"), 1.291 * units.dp(14), "large scale");
-        compare(FontUtils.sizeToPixels("x-large"), 1.714 * units.dp(14), "x-large scale");
+        compare(FontUtils.sizeToPixels("xx-small"), 0.606 * units.dp(14), "xx-small scale");
+        compare(FontUtils.sizeToPixels("x-small"), 0.707 * units.dp(14), "x-small scale");
+        compare(FontUtils.sizeToPixels("small"), 0.857 * units.dp(14), "small scale");
+        compare(FontUtils.sizeToPixels("medium"), 1.0 * units.dp(14), "medium scale");
+        compare(FontUtils.sizeToPixels("large"), 1.414 * units.dp(14), "large scale");
+        compare(FontUtils.sizeToPixels("x-large"), 1.905 * units.dp(14), "x-large scale");
     }
 
     function test_sizeToPixels_failures() {
         compare(FontUtils.sizeToPixels("xxsmall"), 0.0, "xxsmall not defined");
         compare(FontUtils.sizeToPixels("undefined"), 0.0, "undefined scale");
     }
-
 }

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2015-12-12 08:25:22 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2016-01-08 17:10:46 +0000
@@ -20,7 +20,7 @@
 #include "ucbottomedgeregion.h"
 #include "ucbottomedge_p.h"
 #include "ucbottomedgehint.h"
-#include "gestures/ucswipearea.h"
+#include "private/ucswipearea_p.h"
 #include "ucunits.h"
 #include "ucheader.h"
 #include "ucaction.h"

=== modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2015-12-12 08:25:22 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2016-01-08 17:10:46 +0000
@@ -1,5 +1,5 @@
 include(../test-include.pri)
-QT += core-private qml-private quick-private gui-private UbuntuGestures
+QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
 
 SOURCES += \
     tst_bottomedge.cpp

=== added file 'tests/unit_x11/tst_components/[e-mail]'
Binary files tests/unit_x11/tst_components/[e-mail]	1970-01-01 00:00:00 +0000 and tests/unit_x11/tst_components/[e-mail]	2016-01-08 17:10:46 +0000 differ
=== added file 'tests/unit_x11/tst_components/battery-100-charging.svg'
--- tests/unit_x11/tst_components/battery-100-charging.svg	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/battery-100-charging.svg	2016-01-08 17:10:46 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4966" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="90" viewBox="0 0 139.00489 90.000001" width="139" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata4971">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-149.78 -484.51)">
+  <g id="g5120" transform="translate(-433.79 125.71)">
+   <g id="g5124" transform="translate(409.57 223.43)">
+    <g id="g5126" style="fill:none" transform="matrix(2.1875 0 0 1.875 -456 -1657.8)">
+     <rect id="rect5128" style="opacity:.21171;fill:none" transform="translate(0 804.36)" height="48" width="48" y="152" x="288"/>
+    </g>
+    <path id="path5130" style="fill:#808080" transform="translate(174 135.36)" d="m86 15-75.156 0.012c-7.844-0.012-10.844 1.988-10.844 11.988v18 18c0 10 3 12 10.844 11.988l75.156 0.012c7.8438 0.01172 11-2.3633 11-12v-4.0117h8v-13.988-13.988h-8v-4.012c0-9.637-3.156-12.012-11-12zm-75 6c21.619 0.0096 48.956 0.0081 75 0 4 0 5 1 5 6v18 18c0 5-1 6-5 6-26.044-0.008-53.381-0.01-75 0-4 0-5-1-5-6v-18-18c0-5 1-6 5-6z"/>
+    <path id="path5132" style="fill:#38b44a" d="m1051 697c-3 0-4 0-4 5v26c0 5 1 5 4 5h65c3 0 4 0 4-5v-26c0-5-1-5-4-5z" transform="translate(-861 -534.64)"/>
+    <path id="path3847-0" style="fill:#808080" d="m299 150.36-13.996 35h14v25l14.005-35h-14z"/>
+   </g>
+  </g>
+ </g>
+</svg>

=== added file 'tests/unit_x11/tst_components/shape.svg'
--- tests/unit_x11/tst_components/shape.svg	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/shape.svg	2016-01-08 17:10:46 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg3336"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ushape.svg">
+  <defs
+     id="defs3338" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="113.3337"
+     inkscape:cy="-31.239507"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="false"
+     showborder="true" />
+  <metadata
+     id="metadata3341">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <g
+       transform="matrix(0.92774742,0,0,0.92677598,0,190.60819)"
+       id="layer1-3"
+       inkscape:label="Layer 1"
+       style="fill:#000000;display:inline">
+      <g
+         style="fill:#000000"
+         inkscape:label="Layer 1"
+         id="layer1-2"
+         transform="translate(0,9.99998)">
+        <path
+           sodipodi:nodetypes="sssssssss"
+           inkscape:connector-curvature="0"
+           id="path3774"
+           d="m 66.770269,850.78408 72.334451,0 c 58.42399,0 66.77028,8.34623 66.77028,66.77022 l 0,58.03793 c 0,58.42377 -8.34629,66.76997 -66.77028,66.76997 l -72.334451,0 C 8.3462835,1042.3622 0,1034.016 0,975.59223 L 0,917.5543 c 0,-58.42399 8.3462835,-66.77022 66.770269,-66.77022 z"
+           style="fill:#000000;fill-opacity:1;stroke:none;display:inline" />
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'tests/unit_x11/tst_components/tst_imageprovider.qml'
--- tests/unit_x11/tst_components/tst_imageprovider.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_imageprovider.qml	2016-01-08 17:10:46 +0000
@@ -53,16 +53,41 @@
             signalName: "visibleChanged"
         }
 
-        function test_sourceChanged() {
+        function cleanup() {
+            sourceChangeSpy.clear();
+            visibleChangedSpy.clear();
+        }
+
+        // tests adjusted to reproduce bug #1401920
+        function test_sourceChanged_bug1401920_data() {
+            return [
+                {tag: "Bitmap file", file: 'tst_icon-select.png'},
+                {tag: "Bitmap file(18gu)", gu: 18, file: 'tst_icon-select.png'},
+                {tag: "Bitmap with fragment", file: 'tst_icon-select.png#' + Date.now()},
+                {tag: "Bitmap with fragment(18gu)", gu: 18, file: '[e-mail]#' + Date.now()},
+                {tag: "Bitmap file with gu", file: '[e-mail]'},
+                {tag: "Bitmap file with gu(18gu)", gu: 18, file: '[e-mail]'},
+                {tag: "Bitmap with gu/ fragment", file: '[e-mail]#' + Date.now()},
+                {tag: "Bitmap with gu/ fragment(18gu)", gu: 18, file: '[e-mail]#' + Date.now()},
+                {tag: "Scalable file", file: 'battery-100-charging.svg'},
+                {tag: "Scalable file(18gu)", gu: 18, file: 'shape.svg'},
+                {tag: "Scalable with fragment", file: 'shape.svg#' + Date.now()},
+                {tag: "Scalable with fragment(18gu)", gu: 18, file: 'battery-100-charging.svg#' + Date.now()},
+            ];
+        }
+
+        function test_sourceChanged_bug1401920(data) {
+            units.gridUnit = data.gu ? data.gu : 8;
             sourceChangeSpy.target = test;
-            test.source = "/usr/share/icons/ubuntu-mobile/actions/scalable/delete.svg";
-            sourceChangeSpy.wait();
+            test.source = Qt.resolvedUrl(data.file);
+            sourceChangeSpy.wait(400);
+            compare(test.source, Qt.resolvedUrl(data.file));
         }
 
         function test_sourceNOTIFYable() {
             /* Test source through visible to cover NOTIFYable errors */
             visibleChangedSpy.target = bindingTest;
-            bindingTest.source = "/usr/share/icons/ubuntu-mobile/actions/scalable/help.svg";
+            bindingTest.source = Qt.resolvedUrl('battery-100-charging.svg');
             visibleChangedSpy.wait();
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_pagestack.qml'
--- tests/unit_x11/tst_components/tst_pagestack.qml	2015-10-21 19:33:28 +0000
+++ tests/unit_x11/tst_components/tst_pagestack.qml	2016-01-08 17:10:46 +0000
@@ -54,9 +54,15 @@
         id: tabs
         Tab {
             id: tab1
+            page: Page {
+                title: "Tab 1"
+            }
         }
         Tab {
             id: tab2
+            page: Page {
+                title: "Tab 2"
+            }
         }
     }
     Page {

=== modified file 'tests/unit_x11/tst_components/tst_scrollbar.qml'
--- tests/unit_x11/tst_components/tst_scrollbar.qml	2015-12-16 16:33:22 +0000
+++ tests/unit_x11/tst_components/tst_scrollbar.qml	2016-01-08 17:10:46 +0000
@@ -46,7 +46,9 @@
                 Rectangle {
                     id: content
                     width: units.gu(40)
-                    height: units.gu(50)
+                    //make this much taller than the flickable to avoid timing issues when
+                    //detecting if the flickable is flicking in the tests
+                    height: units.gu(200)
                     color: "blue"
                 }
             }
@@ -60,6 +62,9 @@
     SignalSpy {
         id: signalSpy
     }
+    SignalSpy {
+        id: anotherSignalSpy
+    }
 
     Flickable {
         anchors.fill: parent
@@ -126,6 +131,8 @@
         }
         function setupSignalSpy(spy, target, signalName) {
             spy.clear()
+            //reset signalName otherwise it will look for the old signalName in the new target
+            spy.signalName = ""
             spy.target = target
             spy.signalName = signalName
         }
@@ -176,46 +183,81 @@
                     scrollbar_trailingAlign_anchors.flickableItem.top, "top anchor")
         }
 
-        function test_indicatorWhileFlicking() {
+        function test_indicatorStyleWhileFlicking_shortContent() {
             var freshTestItem = getFreshFlickable()
             if (!freshTestItem) return
 
             var flickable = freshTestItem.flickable
             var scrollbar = freshTestItem.scrollbar
 
-            setupSignalSpy(signalSpy, flickable, "movementEnded")
-
-            flick(flickable, 1, 2, units.gu(2), units.gu(3))
-            compare(flickable.moving, true, "not moving")
-            compare(scrollbar.__styleInstance.state, "indicator", "wrong style while flicking")
-
-            signalSpy.wait()
-            compare(signalSpy.count, 1, "flick not completed")
-
-            compare(scrollbar.__styleInstance.state, "hidden", "wrong style while flicking short item")
+            compare(scrollbar.__styleInstance.veryLongContentItem, false, "Scrollable item should be short.")
+
+            setupSignalSpy(signalSpy, flickable, "movingChanged")
+
+            flick(flickable, 1, 2, units.gu(2), -units.gu(10))
+
+            signalSpy.wait()
+            compare(signalSpy.count, 1, "No movingChanged signal after simulating a flick.")
+            compare(flickable.moving, true, "Flickable not moving after simulating a flick.")
+            compare(scrollbar.__styleInstance.state, "indicator", "Wrong style while flicking.")
+
+            //we don't set it up before because the hinting feature already changes the style to thumb
+            //at the beginning
+            setupSignalSpy(anotherSignalSpy, scrollbar.__styleInstance, "stateChanged")
+
+            //make sure the flickable stops
+            mousePress(flickable, 0, 0)
+            mouseMove(flickable, 0, 0)
+            mouseRelease(flickable, 0, 0)
+
+            signalSpy.wait()
+            compare(flickable.moving, false, "Flickable still moving after simulating mouse click.")
+            compare(signalSpy.count, 2, "No movingChanged signal after Flickable stopped moving.")
+
+            anotherSignalSpy.wait()
+            compare(anotherSignalSpy.count, 1, "State unchanged after Flickable stopped moving.")
+            compare(scrollbar.__styleInstance.state, "hidden", "Wrong style after the item stopped moving.")
+
             freshTestItem.destroy()
         }
 
-        function test_thumbStyleVeryLongContent() {
+        function test_thumbStyleWhileFlicking_veryLongContent() {
             var freshTestItem = getFreshFlickable()
             if (!freshTestItem) return
 
             var flickable = freshTestItem.flickable
             var scrollbar = freshTestItem.scrollbar
 
+            setupSignalSpy(signalSpy, scrollbar.__styleInstance, "veryLongContentItemChanged")
             setVeryLongContentItem(flickable)
-            compare(scrollbar.__styleInstance.veryLongContentItem, true, "very long content item not detected")
-
-            setupSignalSpy(signalSpy, flickable, "movementEnded")
-
-            flick(flickable, 1, 2, units.gu(2), units.gu(3))
-            compare(flickable.moving, true, "not moving")
-            compare(scrollbar.__styleInstance.state, "thumb", "wrong style while flicking a very long item")
-
-            signalSpy.wait()
-            compare(signalSpy.count, 1, "flick not completed")
-
-            compare(scrollbar.__styleInstance.state, "hidden", "wrong style while flicking a very long item")
+            signalSpy.wait()
+
+            compare(scrollbar.__styleInstance.veryLongContentItem, true, "Very long content item not detected")
+
+            setupSignalSpy(signalSpy, flickable, "movingChanged")
+            flick(flickable, 1, 2, units.gu(2), -units.gu(10))
+
+            signalSpy.wait()
+            compare(signalSpy.count, 1, "No movingChanged signal after simulating a flick.")
+            compare(flickable.moving, true, "Flickable not moving after simulating a flick.")
+            compare(scrollbar.__styleInstance.state, "thumb", "Wrong style while flicking a very long item")
+
+            //we don't set it up before because the hinting feature already changes the style to thumb
+            //at the beginning
+            setupSignalSpy(anotherSignalSpy, scrollbar.__styleInstance, "stateChanged")
+
+            //make sure the flickable stops
+            mousePress(flickable, 0, 0)
+            mouseMove(flickable, 0, 0)
+            mouseRelease(flickable, 0, 0)
+
+            signalSpy.wait()
+            compare(flickable.moving, false, "Flickable still moving after simulating mouse click.")
+            compare(signalSpy.count, 2, "No movingChanged signal after Flickable stopped moving.")
+
+            anotherSignalSpy.wait()
+            compare(anotherSignalSpy.count, 1, "State unchanged after Flickable stopped moving.")
+            compare(scrollbar.__styleInstance.state, "hidden", "Wrong style after a the item stopped moving.")
             freshTestItem.destroy()
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_shortcuts.qml'
--- tests/unit_x11/tst_components/tst_shortcuts.qml	2015-12-06 11:48:53 +0000
+++ tests/unit_x11/tst_components/tst_shortcuts.qml	2016-01-08 17:10:46 +0000
@@ -46,6 +46,10 @@
 
         function init() {
         }
+        function cleanup() {
+            spy.clear();
+            shortcutSpy.clear();
+        }
 
         SignalSpy {
             id: spy
@@ -102,6 +106,60 @@
             shortcutSpy.clear();
             action.shortcut = undefined;
             shortcutSpy.wait(200);
+            shortcutSpy.target = null;
+        }
+
+        function test_mnemonic_data() {
+            return [
+                {tag: "HW keyboard, valid 'C&all'", kbd: true, text: "C&all", displayText: "C<u>a</u>ll", key: Qt.Key_A, xfail: false},
+                {tag: "HW keyboard, valid '&Save & Exit", kbd: true, text: "&Save & Exit", displayText: "<u>S</u>ave & Exit", key: Qt.Key_S, xfail: false},
+                {tag: "HW keyboard, valid 'Hide &Seek'", kbd: true, text: "Hide&Seek", displayText: "Hide<u>S</u>eek", key: Qt.Key_S, xfail: false},
+                {tag: "HW keyboard, valid 'Save & Exit'", kbd: true, text: "Save & Exit", displayText: "Save <u> </u>Exit", key: Qt.Key_Space, xfail: false},
+                {tag: "HW keyboard, valid 'Paste &&&Proceed'", kbd: true, text: "Paste &&&Proceed", displayText: "Paste &&<u>P</u>roceed", key: Qt.Key_P, xfail: false},
+                {tag: "HW keyboard, valid 'Cut &$'", kbd: true, text: "Cut &$", displayText: "Cut <u>$</u>", key: Qt.Key_Dollar, xfail: false},
+                {tag: "HW keyboard, valid 'At &@'", kbd: true, text: "At &@", displayText: "At <u>@</u>", key: Qt.Key_At, xfail: false},
+                {tag: "HW keyboard, valid '&_'", kbd: true, text: "&_", displayText: "<u>_</u>", key: Qt.Key_Underscore, xfail: false},
+
+                {tag: "HW keyboard, invalid '&&Call'", kbd: true, text: "&&Call", displayText: "&&Call", key: Qt.Key_Asterisk, xfail: true},
+                {tag: "HW keyboard, invalid 'Jump &'", kbd: true, text: "Jump &", displayText: "Jump &", key: Qt.Key_Asterisk, xfail: true},
+                {tag: "HW keyboard, invalid '&&'", kbd: true, text: "&&", displayText: "&&", key: Qt.Key_Asterisk, xfail: true},
+
+                {tag: "no HW keyboard", kbd: false, text: "&Call", displayText: "Call", key: Qt.Key_C, xfail: false},
+            ];
+        }
+        function test_mnemonic(data) {
+            QuickUtils.keyboardAttached = data.kbd;
+            action.text = data.text;
+            if (!data.kbd && QuickUtils.keyboardAttached) {
+                skip("Cannot test this case: " + data.tag);
+            }
+            compare(action.text, data.displayText);
+            // shortcut
+            keyClick(data.key, Qt.AltModifier);
+            if (data.xfail) {
+                expectFail(data.tag, "invalid mnemonic");
+            }
+            spy.wait(200);
+        }
+
+        SignalSpy {
+            id: textSpy
+            target: action
+            signalName: "textChanged"
+        }
+
+        function test_mnemonic_displaytext() {
+            QuickUtils.keyboardAttached = false;
+            if (QuickUtils.keyboardAttached) {
+                skip("the test needs to be able to detach the keyboard");
+            }
+            action.text = "&Call";
+            textSpy.clear();
+            QuickUtils.keyboardAttached = true;
+            if (!QuickUtils.keyboardAttached) {
+                skip("the test needs to be able to attach the keyboard");
+            }
+            textSpy.wait(200);
         }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_slotslayout.qml'
--- tests/unit_x11/tst_components/tst_slotslayout.qml	2015-11-09 16:20:34 +0000
+++ tests/unit_x11/tst_components/tst_slotslayout.qml	2016-01-08 17:10:46 +0000
@@ -66,6 +66,17 @@
             readonly property var trailingSlots: []
         }
         ListItemLayout {
+            id: layoutMultilineLabels
+            title.text: "test \n test"
+            title.maximumLineCount: 2
+            subtitle.text: "test2 \n test2 \n test2"
+            subtitle.maximumLineCount: 3
+            summary.text: "test3 \n test3"
+            summary.maximumLineCount: 2
+            readonly property var leadingSlots: []
+            readonly property var trailingSlots: []
+        }
+        ListItemLayout {
             id: layoutOneLeading
             readonly property var leadingSlots: [layoutOneLeading_leading1]
             readonly property var trailingSlots: []
@@ -375,6 +386,17 @@
             compare(item.padding.trailing, units.gu(1), "Default trailing padding")
         }
 
+        function checkDefaultWrapping(item) {
+            //we have to use WrapAnywhere because otherwise it will have unexpected behaviour
+            //when used together with ElideRight when the string wraps (it will elide too early).
+            compare(item.title.wrapMode, Label.WrapAnywhere, "Wrong default title wrapMode")
+            compare(item.subtitle.wrapMode, Label.WrapAnywhere, "Wrong default subtitle wrapMode")
+            compare(item.summary.wrapMode, Label.WrapAnywhere, "Wrong default summary wrapMode")
+            compare(item.title.elide, Label.ElideRight, "Wrong default title elide")
+            compare(item.subtitle.elide, Label.ElideRight, "Wrong default subtitle elide")
+            compare(item.summary.elide, Label.ElideRight, "Wrong default summary elide")
+        }
+
         function checkImplicitSize(item) {
             compare(item.implicitHeight, expectedImplicitHeight(item), "Implicit height check")
             compare(item.implicitWidth, column.width, "Fill parent's width")
@@ -718,7 +740,7 @@
                             "Default labels positioning, subtitle's y")
                 } else {
                     compare(listitemlayout.subtitle.y,
-                            listitemlayout.title.baselineOffset + units.dp(4),
+                            listitemlayout.title.y + listitemlayout.title.height + units.dp(2),
                             "Default labels positioning, subtitle's y")
                 }
             }
@@ -734,7 +756,7 @@
                         compare(listitemlayout.summary.y, 0,
                                 "Default labels positioning, summary's y")
                     } else {
-                        compare(listitemlayout.summary.y, listitemlayout.title.baselineOffset + units.dp(4),
+                        compare(listitemlayout.summary.y, listitemlayout.title.y + listitemlayout.title.height + units.dp(2),
                                 "Default labels positioning, summary's y")
                     }
                 } else  {
@@ -744,6 +766,10 @@
             }
         }
 
+        function test_defaultLabelsWrappingAndElide() {
+            checkDefaultWrapping(layoutLabels)
+        }
+
         function test_defaultMainSlotHeight() {
             var titleText = layoutLabels.title.text
             var subtitleText = layoutLabels.subtitle.text
@@ -873,5 +899,24 @@
             compare(obj !== null, true, "QML ListItemLayout: testing labels' QML context.")
             obj.destroy()
         }
+
+        //first version of ListItemLayout anchored subtitle to title's baseline, but that breaks
+        //when title is multiline
+        function test_multilineLabelsPositioning() {
+            compare(layoutMultilineLabels.title.maximumLineCount, 2,
+                    "Multiline labels positioning: wrong title maximumLineCount")
+            compare(layoutMultilineLabels.subtitle.maximumLineCount, 3,
+                    "Multiline labels positioning: wrong subtitle maximumLineCount")
+            compare(layoutMultilineLabels.summary.maximumLineCount, 2,
+                    "Multiline labels positioning: wrong summary maximumLineCount")
+
+            compare(layoutMultilineLabels.title.lineCount, 2,
+                    "Multiline labels positioning: wrong title lineCount")
+            compare(layoutMultilineLabels.subtitle.lineCount, 3,
+                    "Multiline labels positioning: wrong subtitle lineCount")
+            compare(layoutMultilineLabels.summary.lineCount, 2,
+                    "Multiline labels positioning: wrong summary lineCount")
+            checkLabelsY(layoutMultilineLabels)
+        }
     }
 }

=== added file 'tests/unit_x11/tst_components/tst_ubuntulistview13.qml'
--- tests/unit_x11/tst_components/tst_ubuntulistview13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_ubuntulistview13.qml	2016-01-08 17:10:46 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(60)
+
+    ListModel {
+        id: dummyModel
+        Component.onCompleted: {
+            reload();
+        }
+        function reload() {
+            clear();
+            for (var i = 0; i < 20; ++i) {
+                dummyModel.append({idx: i});
+            }
+        }
+    }
+
+    // timer used to simulate the model refresh
+    Timer {
+        id: refreshTimer
+        interval: 500
+        onTriggered: {
+            dummyModel.reload();
+        }
+    }
+
+    UbuntuListView {
+        id: ubuntuListView
+        anchors.fill: parent
+        clip: true
+        model: dummyModel
+
+        pullToRefresh {
+            refreshing: refreshTimer.running
+            onRefresh: refreshTimer.restart()
+        }
+
+        delegate: ListItem {
+            id: expandable
+            Label { text: "item " + index }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "UbuntuListView"
+        when: windowShown
+
+        SignalSpy {
+            id: refreshSpy
+            signalName: "onRefresh"
+        }
+
+        function initTestCase() {
+            tryCompare(dummyModel, "count", 20);
+        }
+
+        function init() {
+            waitForRendering(ubuntuListView, 1000);
+        }
+
+        function cleanup() {
+            // scroll the ListView back to top
+            ubuntuListView.positionViewAtIndex(0, ListView.Beginning);
+            refreshSpy.clear();
+            refreshSpy.target = null;
+            ubuntuListView.pullToRefresh.enabled = false;
+        }
+
+        function test_0_defaults() {
+            verify(ubuntuListView.hasOwnProperty("pullToRefresh"), "PullToRefresh is missing");
+            compare(ubuntuListView.pullToRefresh.enabled, false, "PullToRefresh functionality is disabled by default");
+        }
+
+        function test_pullToRefresh_manual_refresh() {
+            ubuntuListView.pullToRefresh.enabled = true;
+            refreshSpy.target = ubuntuListView.pullToRefresh
+            var x = ubuntuListView.width / 2;
+            mouseDrag(ubuntuListView, x, units.gu(1), 0, ubuntuListView.height);
+            refreshSpy.wait();
+            tryCompareFunction(function() { return ubuntuListView.pullToRefresh.refreshing; }, false, 1000);
+            waitForRendering(ubuntuListView, 1000);
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_swipearea/tst_swipearea.cpp'
--- tests/unit_x11/tst_swipearea/tst_swipearea.cpp	2015-12-16 09:52:31 +0000
+++ tests/unit_x11/tst_swipearea/tst_swipearea.cpp	2016-01-08 17:10:46 +0000
@@ -23,8 +23,8 @@
 #include <private/qquickmousearea_p.h>
 #include <private/qquickwindow_p.h>
 
-#include "gestures/ucswipearea.h"
-#include "gestures/ucswipearea_p.h"
+#include "private/ucswipearea_p.h"
+#include "private/ucswipearea_p_p.h"
 #define protected public
 #define private public
 #include <UbuntuGestures/TouchRegistry>

=== modified file 'tests/unit_x11/tst_swipearea/tst_swipearea.pro'
--- tests/unit_x11/tst_swipearea/tst_swipearea.pro	2015-11-06 14:05:07 +0000
+++ tests/unit_x11/tst_swipearea/tst_swipearea.pro	2016-01-08 17:10:46 +0000
@@ -1,5 +1,5 @@
 include(../test-include.pri)
-QT += core-private qml-private quick-private gui-private UbuntuGestures
+QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
 SOURCES += \
     GestureTest.cpp \
     tst_swipearea.cpp