Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA11-landing-2016-04-08

OTA11-landing-2016-04-08

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1928
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2302/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/126/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA11-landing-2016-04-08]

1929. By Zoltan Balogh on 2016-04-08

Merged in the gles files from trunk

1930. By Zoltan Balogh on 2016-04-11

Sync with staging

1931. By Zoltan Balogh on 2016-04-11

Update changelog

1932. By Zoltan Balogh on 2016-04-11

Sync with staging

1933. By Zoltan Balogh on 2016-04-12

Sync with staging

1934. By Zoltan Balogh on 2016-04-12

make test plan executable

1935. By Zoltan Balogh on 2016-04-12

Sync with staging

=== added file '.bazaar/plugins/packaging_sorting.py'
--- .bazaar/plugins/packaging_sorting.py	1970-01-01 00:00:00 +0000
+++ .bazaar/plugins/packaging_sorting.py	2016-04-12 11:09:51 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+# Copyright 2016 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Timo Jyrinki <[e-mail]>
+
+from bzrlib import branch
+from bzrlib import errors
+import os
+import subprocess
+
+def pre_commit_hook(local, master, old_revno, old_revid, future_revno, 
+                    future_revid, tree_delta, future_tree):
+    """Ensure packaging has gone through wrap-and-sort command"""
+
+    if (master.get_parent().find("ubuntu-ui-toolkit") == -1):
+        return
+
+    if not os.path.exists("/usr/bin/wrap-and-sort"):
+      raise errors.BzrError("Please install 'devscripts' package.")
+      return
+
+    subprocess.call(["cp", "-a", "debian", "debian-packaging-wraptest-temporary"])
+
+    subprocess.call(["wrap-and-sort", "-a", "-t"])
+
+    returncode = subprocess.call(["diff", "-urN",
+        "debian-packaging-wraptest-temporary", "debian"])
+    if returncode == 1:
+      subprocess.call(["rm", "-rf", "debian-packaging-wraptest-temporary"])
+      raise errors.BzrError("Please run wrap-and-sort -a -t to clean up packaging.")
+
+    subprocess.call(["rm", "-rf", "debian-packaging-wraptest-temporary"])
+
+branch.Branch.hooks.install_named_hook("pre_commit", pre_commit_hook, "Check packaging sorting")

=== modified file 'components.api'
--- components.api	2016-03-30 13:42:32 +0000
+++ components.api	2016-04-12 11:09:51 +0000
@@ -826,14 +826,18 @@
     readonly property ActionBar leadingActionBar
     property list<Action> navigationActions
     readonly property Sections sections
+    property string subtitle
     property string title
     readonly property ActionBar trailingActionBar
 Ubuntu.Components.Styles.PageHeaderStyle 1.3: Item
     property color backgroundColor
     property double contentHeight
     property Component defaultActionDelegate
+    property color disabledForegroundColor
     property color dividerColor
     property color foregroundColor
+    property color subtitleColor
+    property Component subtitleComponent
     property Component titleComponent
 Ubuntu.Components.PageStack 1.0 0.1: PageTreeNode
     property Item currentPage

=== modified file 'debian/bileto_convert_to_gles'
--- debian/bileto_convert_to_gles	2016-04-06 20:16:20 +0000
+++ debian/bileto_convert_to_gles	2016-04-12 11:09:51 +0000
@@ -12,6 +12,6 @@
 
 sed --in-place 's/^ubuntu-ui-toolkit /ubuntu-ui-toolkit-gles /g' debian/changelog
 
-for gles in libubuntutoolkit5-gles-dev.install libubuntugestures5-gles-dev.install libubuntugestures5-gles.install libubuntutoolkit5-gles.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides; do
+for gles in libubuntugestures5-gles.install libubuntugestures5-gles-dev.install libubuntutoolkit5-gles.install libubuntutoolkit5-gles-dev.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides qml-module-ubuntu-performancemetrics-gles.install ; do
     mv --verbose debian/"$(echo $gles | sed 's/-gles//')" debian/$gles
 done

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-08 15:23:50 +0000
+++ debian/changelog	2016-04-12 11:09:51 +0000
@@ -1,3 +1,46 @@
+ubuntu-ui-toolkit (1.3.1938+16.04) UNRELEASED; urgency=medium
+
+  [ Tim Peeters ]
+  * Hide the PageStack back button when depth == 1. Fixes LP: #1565811
+  * Add header subtitle. Fixes LP: #1399289
+  * Reveal the header in gallery when changing the layout to two columns. 
+    Fixes LP: #1556860
+  * Set correct colors for disabled actions in the header. 
+    Fixes LP: #1393485
+  * Disable tst_datepicker.qml to unblock the staging.Fixes LP: #1567840
+  * Prevent invisible header from setting the flickable topMargin. 
+    Fixes LP: #1560419, LP: #1560458, LP: #1566231.
+
+  [ Zsombor Egri ]
+  * Move MouseTouchAdaptor into UbuntuToolkit library. Fix adaptor code for
+    Xenial. Fixes LP: #1561436
+
+  [ Christian Dywan ]
+  * Don't use a separate argument to distinguish touch events. If it's touch,
+    it has our overloaded methods. Fixes LP: #1530802
+  * Use export_qml_dir.sh in qmlapicheck and runtest Also add Usage to runtest.
+    Fixes LP: #1567286.
+  * Summary style error results with sections. Fixes LP: #1568804
+
+  [ Andrea Bernabei ]
+  * Mouse filter: check if mouse is inside the area on mouse moves and 
+    setHovered accordingly. Fixes LP: #1566378.
+
+  [ Timo Jyrinki ]
+  * Add latest changes for GLES.
+  * Add back Provides: qtdeclarative5-ubuntu-ui-toolkit-plugin to resolve 
+    upgrade issue. Fixes LP: #1568817
+  * Fix wrapper script auto-generated by Qt that incorrectly tries to execute 
+    itself. Fixes LP: #1560000
+  * bileto_convert_to_gles: sort and add 
+    qml-module-ubuntu-performancemetrics-gles.install. Fixes LP: #1569217
+ 
+
+  [ Zolán Balogh ]
+  * Fix the UITK test plan script.
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 08 Apr 2016 20:28:19 +0300
+
 ubuntu-ui-toolkit (1.3.1918+16.04.20160404-0ubuntu1) xenial; urgency=medium
 
   [ Benjamin Zeller ] 

=== modified file 'debian/control'
--- debian/control	2016-04-08 14:07:07 +0000
+++ debian/control	2016-04-12 11:09:51 +0000
@@ -22,6 +22,9 @@
                libqt5sql5-sqlite,
                libqt5svg5-dev,
                libudev-dev,
+               libx11-dev[!armhf],
+               libxcb1-dev[!armhf],
+               libxi-dev[!armhf],
                libxkbcommon-dev,
                libxrender-dev,
                locales,

=== modified file 'debian/control.gles'
--- debian/control.gles	2016-04-08 18:12:17 +0000
+++ debian/control.gles	2016-04-12 11:09:51 +0000
@@ -87,6 +87,7 @@
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
           qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
 Provides: qml-module-ubuntu-components,
+          qtdeclarative5-ubuntu-ui-toolkit-plugin,
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~),
              ${misc:Pre-Depends},

=== modified file 'debian/libubuntutoolkit5-dev.install'
--- debian/libubuntutoolkit5-dev.install	2016-03-04 11:58:12 +0000
+++ debian/libubuntutoolkit5-dev.install	2016-04-12 11:09:51 +0000
@@ -1,11 +1,13 @@
 usr/include/*/qt5/UbuntuToolkit/AsyncLoader
 usr/include/*/qt5/UbuntuToolkit/ColorUtils
+usr/include/*/qt5/UbuntuToolkit/MouseTouchAdaptor
 usr/include/*/qt5/UbuntuToolkit/Tree
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
 usr/include/*/qt5/UbuntuToolkit/asyncloader.h
 usr/include/*/qt5/UbuntuToolkit/colorutils.h
+usr/include/*/qt5/UbuntuToolkit/mousetouchadaptor.h
 usr/include/*/qt5/UbuntuToolkit/tree.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h

=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2016-02-29 16:09:02 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2016-04-12 11:09:51 +0000
@@ -24,6 +24,8 @@
     header: PageHeader {
         title: mainPage.title
         flickable: layout.columns === 1 ? widgetList : null
+        // avoid header staying hidden when resizing back to two columns, bug #1556860
+        onFlickableChanged: exposed = true
         trailingActionBar.actions: [
             Action {
                 text: i18n.tr('Right to Left')

=== modified file 'export_qml_dir.sh'
--- export_qml_dir.sh	2016-03-21 17:51:44 +0000
+++ export_qml_dir.sh	2016-04-12 11:09:51 +0000
@@ -26,6 +26,8 @@
 UBUNTU_QML_ROOT=$BUILD_DIR/qml/Ubuntu
 UBUNTU_QML_DIRS=$UBUNTU_QML_ROOT/Components:$UBUNTU_QML_ROOT/Test:$UBUNTU_QML_ROOT/Layouts:$UBUNTU_QML_ROOT/PerformanceMetrics
 export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS$LD_LIBRARY_PATH
+# Build machines may not have initctl and don't need it
+test -f /sbin/initctl || return 0
 /sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml

=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2016-01-12 13:48:53 +0000
+++ features/ubuntu_qml_plugin.prf	2016-04-12 11:09:51 +0000
@@ -46,9 +46,12 @@
     ld_lib_path.value += $$shell_path($$ROOT_BUILD_DIR/lib)
     ld_lib_path.value = $$unique(ld_lib_path.value)
 
-    qtAddToolEnv(QMLPLUGINDUMP, importpath)
-    qtAddToolEnv(QMLPLUGINDUMP, membackend)
-    qtAddToolEnv(QMLPLUGINDUMP, ld_lib_path)
+
+    QMLPLUGINDUMP_ENV_VARS = importpath \
+                             membackend \
+                             ld_lib_path
+
+    qtAddToolEnv(QMLPLUGINDUMP, $$QMLPLUGINDUMP_ENV_VARS)
 
     TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
 

=== modified file 'src/Ubuntu/Components/1.3/InputHandler.qml'
--- src/Ubuntu/Components/1.3/InputHandler.qml	2015-11-20 15:18:50 +0000
+++ src/Ubuntu/Components/1.3/InputHandler.qml	2016-04-12 11:09:51 +0000
@@ -147,7 +147,7 @@
         return p;
     }
     // focuses the input if not yet focused, and shows the context menu
-    function openContextMenu(mouse, noAutoselect, fromTouch) {
+    function openContextMenu(mouse, noAutoselect) {
         var pos = mousePosition(mouse);
         if (!main.focus || !mouseInSelection(mouse)) {
             activateInput();
@@ -157,7 +157,7 @@
             }
         }
         // open context menu at the cursor position
-        inputHandler.pressAndHold(input.cursorPosition, fromTouch);
+        inputHandler.pressAndHold(input.cursorPosition, mouse.touch);
         // if opened with left press (touch falls into this criteria as well), we need to set state to inactive
         // so the mouse moves won't result in selected text loss/change
         if (mouse.button === Qt.LeftButton) {
@@ -341,8 +341,8 @@
     }
 
     // touch and mous handling
-    function handlePressed(event, touch) {
-        if (touch) {
+    function handlePressed(event) {
+        if (event.touch) {
             // we do not have longTap or double tap, therefore we need to generate those
             event.touch();
         } else {
@@ -352,8 +352,8 @@
         // remember pressed position as we need it when entering into selection state
         pressedPosition = mousePosition(event);
     }
-    function handleReleased(event, touch) {
-        if (touch) {
+    function handleReleased(event) {
+        if (event.touch) {
             event.untouch();
         }
         if ((!main.focus && !main.activeFocusOnPress) || suppressReleaseEvent === true) {
@@ -362,7 +362,7 @@
         }
 
         activateInput();
-        if (state === "" || touch) {
+        if (state === "" || event.touch) {
             input.cursorPosition = mousePosition(event);
         }
         moveStarts = moveEnds = -1;
@@ -370,21 +370,21 @@
         // check if we get right-click from the frame or the area that has no text
         if (event.button === Qt.RightButton) {
             // open the popover
-            inputHandler.pressAndHold(input.cursorPosition, touch);
+            inputHandler.pressAndHold(input.cursorPosition, event.touch);
         } else {
             inputHandler.tap(input.cursorPosition);
         }
     }
-    function handleMove(event, touch ) {
+    function handleMove(event) {
         // leave if not focus, not the left button or not in select state
-        if (!input.activeFocus || (!touch && event.button !== Qt.LeftButton) || !main.selectByMouse) {
+        if (!input.activeFocus || (!event.touch && event.button !== Qt.LeftButton) || !main.selectByMouse) {
             return;
         }
         selectText(event);
     }
-    function handleDblClick(event, touch) {
+    function handleDblClick(event) {
         if (main.selectByMouse) {
-            openContextMenu(event, false, touch);
+            openContextMenu(event, false);
             // turn selection state temporarily so the selection is not cleared on release
             state = "selection";
             suppressReleaseEvent = true;
@@ -393,17 +393,17 @@
 
     // Mouse handling
     Mouse.forwardTo: [main]
-    Mouse.onPressed: handlePressed(mouse, false)
-    Mouse.onReleased: handleReleased(mouse, false)
-    Mouse.onPositionChanged: handleMove(mouse, false)
-    Mouse.onDoubleClicked: handleDblClick(mouse, false)
+    Mouse.onPressed: handlePressed(mouse)
+    Mouse.onReleased: handleReleased(mouse)
+    Mouse.onPositionChanged: handleMove(mouse)
+    Mouse.onDoubleClicked: handleDblClick(mouse)
 
     // right button handling
     MouseArea {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
         // trigger pressAndHold
-        onReleased: openContextMenu(mouse, true, false)
+        onReleased: openContextMenu(mouse, true)
         cursorShape: Qt.IBeamCursor
     }
     Keys.onMenuPressed: inputHandler.pressAndHold(input.cursorPosition, false);
@@ -442,7 +442,7 @@
             if (touchPoint.startY - touchPoint.y < -units.gu(2))
                 return;
 
-            openContextMenu(touchPoint, false, true);
+            openContextMenu(touchPoint, false);
             suppressReleaseEvent = true;
         }
     }
@@ -456,8 +456,8 @@
             tapCount = running;
         }
     }
-    onPressed: handlePressed(touchPoints[0], true)
-    onReleased: handleReleased(touchPoints[0], true)
+    onPressed: handlePressed(touchPoints[0])
+    onReleased: handleReleased(touchPoints[0])
 
     property Item cursorPositionCursor: null
     property Item selectionStartCursor: null

=== modified file 'src/Ubuntu/Components/1.3/Page.qml'
--- src/Ubuntu/Components/1.3/Page.qml	2016-02-15 14:17:32 +0000
+++ src/Ubuntu/Components/1.3/Page.qml	2016-04-12 11:09:51 +0000
@@ -162,19 +162,16 @@
         }
 
         property Item previousHeader: null
-        property Item previousHeaderParent: null
         function updateHeader() {
             internal.showDeprecationWarning = false;
             if (internal.previousHeader) {
-                internal.previousHeader.parent = internal.previousHeaderParent;
+                internal.previousHeader.parent = null;
             }
             if (page.header) {
-                internal.previousHeaderParent = page.header.parent;
                 internal.previousHeader = page.header;
                 page.header.parent = page;
             } else {
                 internal.previousHeader = null;
-                internal.previousHeaderParent = null;
             }
         }
 

=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2016-02-02 13:49:50 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-04-12 11:09:51 +0000
@@ -54,9 +54,14 @@
     property string title
 
     /*!
-      The contents item to display in the header. By default the contents
-      is undefined, and setting it will disable showing of the title in
-      the header.
+      Displayed under the title.
+      Hidden when the \l contents Item is set.
+     */
+    property string subtitle
+
+    /*!
+      The contents item to display in the header. By default the contents is
+      undefined, and setting it will disable showing of the title and subtitle.
 
       Example:
       \qml
@@ -79,6 +84,7 @@
 
     Component.onCompleted: contentsHolder.updateContents()
     onContentsChanged: contentsHolder.updateContents()
+    onSubtitleChanged: contentsHolder.updateContents()
 
     Item {
         id: contentsHolder
@@ -94,6 +100,11 @@
             id: titleLoader
             anchors.fill: parent
         }
+        Loader {
+            id: subtitleLoader
+            anchors.fill: parent
+        }
+
         property Item previousContents: null
         property Item previousContentsParent: null
 
@@ -110,6 +121,11 @@
                 previousContents = null;
                 previousContentsParent = null;
                 titleLoader.sourceComponent = __styleInstance.titleComponent;
+                if (!subtitle) {
+                    subtitleLoader.sourceComponent = null;
+                } else {
+                    subtitleLoader.sourceComponent = __styleInstance.subtitleComponent;
+                }
             }
         }
 

=== modified file 'src/Ubuntu/Components/1.3/PageStack.qml'
--- src/Ubuntu/Components/1.3/PageStack.qml	2016-02-08 13:55:17 +0000
+++ src/Ubuntu/Components/1.3/PageStack.qml	2016-04-12 11:09:51 +0000
@@ -218,14 +218,13 @@
     Action {
         // used when the Page has a Page.header property set.
         id: backAction
-        visible: pageStack.depth > 0
+        visible: pageStack.depth > 1
         iconName: "back"
         text: "Back"
         onTriggered: pageStack.pop()
         objectName: "pagestack_back_action"
     }
 
-
     Component {
         id: pageWrapperComponent
         PageWrapper{

=== modified file 'src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2015-11-27 14:59:03 +0000
+++ src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -30,6 +30,16 @@
     property color foregroundColor
 
     /*!
+      The color of disabled action buttons in the header.
+     */
+    property color disabledForegroundColor
+
+    /*!
+      The color of the (optional) subtitle.
+     */
+    property color subtitleColor
+
+    /*!
       The color of the background of the header.
      */
     property color backgroundColor
@@ -51,6 +61,11 @@
     property Component titleComponent
 
     /*!
+      The default component to display the subtitle.
+     */
+    property Component subtitleComponent
+
+    /*!
       The height of the header excluding the divider and extension.
      */
     property real contentHeight

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2016-01-27 16:42:47 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2016-04-12 11:09:51 +0000
@@ -42,9 +42,12 @@
     /*!
       The foreground color (icon and text) of actions in the panel.
      */
-    property color foregroundColor: styledItem.enabled
-                                        ? theme.palette.normal.backgroundText
-                                        : theme.palette.disabled.backgroundText
+    property color foregroundColor: theme.palette.normal.backgroundText
+
+    /*!
+      The foreground color (icon and text) of disabled actions in the panel.
+     */
+    property color disabledForegroundColor: theme.palette.disabled.backgroundText
 
     property bool square: true
     callerMargin: -units.gu(1) + units.dp(4)
@@ -83,7 +86,8 @@
             id: actionIcon
             visible: "" != action.iconSource
             source: action.iconSource
-            color: overflow.foregroundColor
+            color: enabled ? overflow.foregroundColor
+                           : overflow.disabledForegroundColor
             anchors {
                 verticalCenter: parent.verticalCenter
                 verticalCenterOffset: units.dp(-1)
@@ -107,7 +111,8 @@
             textSize: actionIcon.visible ? Label.Small : Label.Medium
             elide: Text.ElideRight
             text: action.text
-            color: overflow.foregroundColor
+            color: enabled ? overflow.foregroundColor
+                           : overflow.disabledForegroundColor
         }
 
         // The value of showDivider is automatically set by ActionSelectionPopover.

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-02-29 16:02:50 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-04-12 11:09:51 +0000
@@ -22,51 +22,119 @@
     id: pageHeaderStyle
 
     foregroundColor: theme.palette.normal.backgroundText
+    disabledForegroundColor: theme.palette.disabled.backgroundText
+    subtitleColor: theme.palette.normal.backgroundTertiaryText
     backgroundColor: theme.palette.normal.background
     dividerColor: theme.palette.normal.base
+
+    // Font weight for the title and subtitle
     property int fontWeight: Font.Light
+
+    // Text size for title
     property int textSize: Label.Large
 
-    // reduced content height on a phone in landscape mode
-    contentHeight: Screen.height > units.gu(50) ? units.gu(6) : units.gu(5)
+    // Text size for subtitle
+    property int subTextSize: internal.landscape ? Label.Small : Label.Medium
+
+    contentHeight: internal.titleAreaHeight + internal.titleBottomSpacing
     implicitHeight: contentHeight + divider.height + internal.extensionHeight
 
+    Component.onCompleted: internal.updateHeights()
     Object {
         id: internal
-        property real extensionHeight: styledItem.extension ?
-                                         styledItem.extension.height
+        property real extensionHeight: styledItem.extension
+                                       ? styledItem.extension.height
                                        : styledItem.sections.height
+
+        property bool landscape: Screen.height <= units.gu(50)
+        property bool hasSubtitle: styledItem.subtitle && !styledItem.contents
+        property bool hasExtension: styledItem.extension
+
+        // The height of the area in which the title and icons are vertically centered
+        property real titleAreaHeight
+        // Add to the content height for additional space under the title
+        property real titleBottomSpacing
+
+        onLandscapeChanged: updateHeights()
+        onHasSubtitleChanged: updateHeights()
+        onHasExtensionChanged: updateHeights()
+
+        function updateHeights() {
+            if (landscape) {
+                if (hasSubtitle) {
+                    // with subtitle, and with or without extension
+                    titleAreaHeight = units.gu(4);
+                    titleBottomSpacing = units.gu(2);
+                } else if (hasExtension) {
+                    titleAreaHeight = units.gu(4);
+                    titleBottomSpacing = units.gu(1);
+                } else {
+                    titleAreaHeight = units.gu(5)
+                    titleBottomSpacing = 0;
+                }
+            } else { // portrait
+                titleAreaHeight = units.gu(6);
+                if (hasSubtitle) {
+                    titleBottomSpacing = units.gu(1);
+                } else {
+                    titleBottomSpacing = 0;
+                }
+            }
+        }
     }
 
     defaultActionDelegate: AbstractButton {
         style: IconButtonStyle { }
         objectName: action.objectName + "_button"
-        height: parent ? parent.height : undefined
+        height: internal.titleAreaHeight
         action: modelData
         StyleHints {
-            // FIXME: introduce inactiveForegroundColor to PageHeaderStyle
-            foregroundColor: pageHeaderStyle.foregroundColor
-        }
-    }
-
-    titleComponent: Item {
-        // The wrapping inside the extra Item is needed to
-        //  be able to position the Label vertically. Without it,
-        //  the Loader resizes the Label to span the full height.
-        Label {
-            id: titleLabel
-            objectName: "header_title_label"
-            text: styledItem.title
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                verticalCenter: parent.verticalCenter
-            }
-            color: pageHeaderStyle.foregroundColor
-            font.weight: pageHeaderStyle.fontWeight
-            textSize: pageHeaderStyle.textSize
-            elide: Text.ElideRight
+            foregroundColor: enabled ? pageHeaderStyle.foregroundColor
+                                     : pageHeaderStyle.disabledForegroundColor
+        }
+    }
+
+    titleComponent: Component {
+        Item {
+            // The wrapping inside the extra Item is needed to
+            //  be able to position the Label vertically. Without it,
+            //  the Loader resizes the Label to span the full height.
+            Label {
+                id: titleLabel
+                objectName: "header_title_label"
+                text: styledItem.title
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                    verticalCenterOffset: -internal.titleBottomSpacing/2
+                }
+                color: pageHeaderStyle.foregroundColor
+                font.weight: pageHeaderStyle.fontWeight
+                textSize: pageHeaderStyle.textSize
+                elide: Text.ElideRight
+            }
+        }
+    }
+
+    subtitleComponent: Component {
+        Item {
+            // Item fills the contents height
+            Label {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    baseline: parent.bottom
+                    baselineOffset: -units.gu(1)
+                }
+                objectName: "header_subtitle_label"
+                text: styledItem.subtitle
+                color: pageHeaderStyle.subtitleColor
+                visible: text != ""
+                textSize: pageHeaderStyle.subTextSize
+                font.weight: pageHeaderStyle.fontWeight
+            }
         }
     }
 

=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
--- src/Ubuntu/Components/plugin/ucheader.cpp	2016-02-15 13:19:05 +0000
+++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-12 11:09:51 +0000
@@ -21,8 +21,6 @@
 #include <QtQuick/private/qquickanimation_p.h>
 #include "ucubuntuanimation.h"
 #include "ucunits.h"
-#include "propertychange_p.h"
-
 
 /*!
     \qmltype Header
@@ -79,8 +77,8 @@
     : UCStyledItemBase(parent)
     , m_flickable(Q_NULLPTR)
     , m_showHideAnimation(new QQuickNumberAnimation)
-    , m_flickableTopMarginBackup(Q_NULLPTR)
     , m_previous_contentY(0)
+    , m_previous_header_height(0)
     , m_exposed(true)
     , m_moving(false)
 {
@@ -97,8 +95,7 @@
 
 UCHeader::~UCHeader() {
     if (m_flickable != Q_NULLPTR) {
-        Q_ASSERT(m_flickableTopMarginBackup != Q_NULLPTR);
-        delete m_flickableTopMarginBackup;
+        m_flickable->setTopMargin(m_flickable->topMargin() - m_previous_header_height);
     }
 }
 
@@ -116,6 +113,13 @@
     }
 }
 
+void UCHeader::itemChange(ItemChange change, const ItemChangeData &value) {
+    if (change == ItemVisibleHasChanged || change == ItemParentHasChanged) {
+        updateFlickableMargins();
+    }
+    UCStyledItemBase::itemChange(change, value);
+}
+
 /*!
  * \qmlproperty Flickable Header::flickable
  *
@@ -127,10 +131,45 @@
  *
  * When flickable is null, the header can be exposed or
  * hidden by setting the \l exposed property.
+ * Note that \l exposed is not automatically updated when the value of flickable
+ * changes, so if the header must be exposed when the flickable changes
+ * (or is set to null), this must be done explicitly. Example:
+ * \qml
+ *  import QtQuick 2.4
+ *  import Ubuntu.Components 1.3
+ *
+ *  MainView {
+ *      width: units.gu(60)
+ *      height: units.gu(80)
+ *
+ *      AdaptivePageLayout {
+ *          id: layout
+ *          anchors.fill: parent
+ *          primaryPage: Page {
+ *              id: page
+ *              Flickable {
+ *                  id: contentFlick
+ *                  anchors.fill: parent
+ *                  topMargin: page.header.flickable ? 0 : page.header.height
+ *                  contentHeight: units.gu(200)
+ *                  // Scrolling here can hide the header.
+ *              }
+ *              header: PageHeader {
+ *                  title: i18n.tr("Navigation")
+ *                  flickable: layout.columns === 1 ? contentFlick : null
+ *                  // Show header when it gets locked in a two-column layout:
+ *                  onFlickableChanged: exposed = true
+ *              }
+ *          }
+ *      }
+ *  }
+ * \endqml
  *
  * The topMargin of the flickable will automatically be updated to always match
  * the height of the header. When changing the flickable, the topMargin of the previous
- * flickable is set to 0.
+ * flickable is set to 0. When the header is invisible because its visible property is
+ * false, or the header has no parent, the flickable topMargin does not reflect the
+ * header height.
  *
  * It is permitted to use a ListView as the value of flickable, but this works
  * well only if the ListView.header property is not set. Alternatively,
@@ -146,8 +185,6 @@
         return;
     }
     if (!m_flickable.isNull()) {
-        Q_ASSERT(m_flickableTopMarginBackup != Q_NULLPTR);
-
         // Finish the current header movement in case the current
         //  flickable is disconnected while scrolling.
         if (m_exposed) {
@@ -157,23 +194,24 @@
         }
         m_flickable->disconnect(this);
 
-        qreal oldMargin = m_flickable->topMargin();
-        // store contentY to compensate for Flickable updating the position due to margin change.
-        qreal oldContentY = m_flickable->contentY();
-        delete m_flickableTopMarginBackup; // Restores previous value/binding for topMargin.
-        m_flickableTopMarginBackup = Q_NULLPTR;
+        // store the current sum of the topMargin and contentY so that we
+        //  can add the change in topMargin+contentY to the new contentY after
+        //  updating the topMargin so that the user will still see the same
+        //  flickable contents at the top of the view after the header height changed.
+        qreal delta = m_flickable->topMargin() + m_flickable->contentY();
+        m_flickable->setTopMargin(m_flickable->topMargin() - m_previous_header_height);
+        m_previous_header_height = 0;
+        delta -= m_flickable->topMargin() + m_flickable->contentY();
 
-        qreal delta = m_flickable->topMargin() - oldMargin + m_flickable->contentY() - oldContentY;
         // revert the flickable content Y.
-        m_flickable->setContentY(m_flickable->contentY() - delta);
+        m_flickable->setContentY(m_flickable->contentY() + delta);
     }
 
     m_flickable = flickable;
     Q_EMIT flickableChanged();
 
-    Q_ASSERT(m_flickableTopMarginBackup == Q_NULLPTR);
+    Q_ASSERT(m_previous_header_height == 0);
     if (!m_flickable.isNull()) {
-        m_flickableTopMarginBackup = new PropertyChange(m_flickable, "topMargin");
         updateFlickableMargins();
         connect(m_flickable, SIGNAL(contentYChanged()),
                 this, SLOT(_q_scrolledContents()));
@@ -192,14 +230,17 @@
     if (m_flickable.isNull()) {
         return;
     }
-    qreal headerHeight = height();
-    qreal previousHeaderHeight = m_flickable->topMargin();
-    if (headerHeight != previousHeaderHeight) {
+    qreal headerHeight = 0.0;
+    if (isVisible() && parentItem()) {
+        headerHeight = height();
+    } // else: header is not visible, so do not add to the topMargin.
+    if (headerHeight != m_previous_header_height) {
         qreal previousContentY = m_flickable->contentY();
-        PropertyChange::setValue(m_flickableTopMarginBackup, headerHeight);
+        m_flickable->setTopMargin(m_flickable->topMargin() + headerHeight - m_previous_header_height);
         // Push down contents when header grows,
         //  pull up contents when header shrinks.
-        m_flickable->setContentY(previousContentY - headerHeight + previousHeaderHeight);
+        m_flickable->setContentY(previousContentY - headerHeight + m_previous_header_height);
+        m_previous_header_height = headerHeight;
     }
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucheader.h'
--- src/Ubuntu/Components/plugin/ucheader.h	2016-02-02 12:17:58 +0000
+++ src/Ubuntu/Components/plugin/ucheader.h	2016-04-12 11:09:51 +0000
@@ -23,7 +23,6 @@
 class QQuickFlickable;
 class QQuickNumberAnimation;
 class UCUbuntuAnimation;
-class PropertyChange;
 
 class UCHeader : public UCStyledItemBase
 {
@@ -49,6 +48,7 @@
 protected:
     virtual void show(bool animate);
     virtual void hide(bool animate);
+    virtual void itemChange(ItemChange change, const ItemChangeData &value);
 
 private Q_SLOTS:
     void _q_scrolledContents();
@@ -61,9 +61,9 @@
 private:
     QPointer<QQuickFlickable> m_flickable;
     QQuickNumberAnimation* m_showHideAnimation;
-    PropertyChange* m_flickableTopMarginBackup;
 
     qreal m_previous_contentY;
+    qreal m_previous_header_height;
     bool m_exposed:1;
     bool m_moving:1;
 

=== modified file 'src/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-01-30 12:03:31 +0000
+++ src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-04-12 11:09:51 +0000
@@ -608,7 +608,8 @@
             m_pressAndHoldTimer.stop();
         }
 
-        setHovered(true, 0);
+        setHovered(m_owner->contains(m_lastPos), Q_NULLPTR);
+
         m_moved = true;
         m_doubleClicked = false;
         QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,

=== modified file 'src/Ubuntu/Test/plugin/plugin.pri'
--- src/Ubuntu/Test/plugin/plugin.pri	2016-02-25 02:29:05 +0000
+++ src/Ubuntu/Test/plugin/plugin.pri	2016-04-12 11:09:51 +0000
@@ -1,4 +1,4 @@
-QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures
+QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures UbuntuToolkit
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT *= v8-private
@@ -15,11 +15,9 @@
 HEADERS += \
     $$PWD/uctestcase.h \
     $$PWD/testplugin.h \
-    $$PWD/uctestextras.h \
-    $$PWD/ucmousetouchadaptor.h \
+    $$PWD/uctestextras.h
 
 SOURCES += \
     $$PWD/uctestcase.cpp \
     $$PWD/testplugin.cpp \
-    $$PWD/uctestextras.cpp \
-    $$PWD/ucmousetouchadaptor.cpp \
+    $$PWD/uctestextras.cpp

=== modified file 'src/Ubuntu/Test/plugin/testplugin.cpp'
--- src/Ubuntu/Test/plugin/testplugin.cpp	2015-10-21 08:33:21 +0000
+++ src/Ubuntu/Test/plugin/testplugin.cpp	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
 #include "testplugin.h"
 #include <QtQml>
 #include "uctestextras.h"
-#include "ucmousetouchadaptor.h"
+#include <MouseTouchAdaptor>
 
 static QObject *registerExtras(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -27,16 +27,8 @@
     return new UCTestExtras;
 }
 
-static QObject *registerAdaptor(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-
-    return new UCMouseTouchAdaptor;
-}
-
 void TestPlugin::registerTypes(const char *uri)
 {
     qmlRegisterSingletonType<UCTestExtras>(uri, 1, 0, "TestExtras", registerExtras);
-    qmlRegisterSingletonType<UCMouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", registerAdaptor);
+    qmlRegisterSingletonType<UbuntuToolkit::MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", UbuntuToolkit::MouseTouchAdaptor::registerQmlSingleton);
 }

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
--- src/Ubuntu/Test/plugin/uctestextras.cpp	2015-12-17 15:23:26 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.cpp	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -23,6 +23,7 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <private/qobject_p.h>
 #include <QSysInfo>
+#include <MouseTouchAdaptor>
 
 const char *DEVICE_MISSING_MSG = "No touch device registered. Register one using registerTouchDevice() before using %1";
 
@@ -40,7 +41,6 @@
         return; \
     }
 
-QTouchDevice *UCTestExtras::m_touchDevice = 0;
 UCTestExtras *UCTestExtras::m_testExtras = 0;
 
 /*!
@@ -118,24 +118,8 @@
  */
 void UCTestExtras::registerTouchDevice()
 {
-    // check if there is any touch device registered in the system
-    if (!m_touchDevice) {
-        QList<const QTouchDevice*> touchDevices = QTouchDevice::devices();
-        Q_FOREACH(const QTouchDevice *device, touchDevices) {
-            if (device->type() == QTouchDevice::TouchScreen) {
-                m_touchDevice = const_cast<QTouchDevice*>(device);
-                break;
-            }
-        }
-    }
-    // if none, register one
-    if (!m_touchDevice) {
-        m_touchDevice = new QTouchDevice;
-        m_touchDevice->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(m_touchDevice);
-        if (m_testExtras) {
-            Q_EMIT m_testExtras->touchDevicePresentChanged();
-        }
+    if (UbuntuToolkit::MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
+        Q_EMIT m_testExtras->touchDevicePresentChanged();
     }
 }
 
@@ -148,7 +132,7 @@
 void UCTestExtras::touchPress(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), m_touchDevice).press(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchRelease(touchId, item, point)
@@ -158,7 +142,7 @@
 void UCTestExtras::touchRelease(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), m_touchDevice).release(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchClick(touchId, item, point)
@@ -207,7 +191,7 @@
 void UCTestExtras::touchMove(int touchId, QQuickItem *item, const QPoint &point)
 {
     CHECK_TOUCH_DEVICE(touchId, item);
-    QTest::touchEvent(item->window(), m_touchDevice).move(touchId, item->mapToScene(point).toPoint(), item->window());
+    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
 }
 /*!
  * \qmlmethod TestExtras::touchDrag(touchId, item, from, delta, steps = 5)

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.h'
--- src/Ubuntu/Test/plugin/uctestextras.h	2015-12-17 14:42:40 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.h	2016-04-12 11:09:51 +0000
@@ -53,7 +53,6 @@
     static void mouseDragWithPoints(QQuickItem *item, QList<QPoint> points, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int delay = -1);
 
 private:
-    static QTouchDevice *m_touchDevice;
     static UCTestExtras *m_testExtras;
 
     friend class UCMouseTouchAdaptor;

=== modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-02-25 14:35:59 +0000
+++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-04-12 11:09:51 +0000
@@ -1,7 +1,14 @@
 TEMPLATE=lib
 TARGET=UbuntuToolkit
 
-QT *= core-private gui-private qml qml-private quick quick-private
+QT *= core-private gui-private qml qml-private quick quick-private testlib
+
+!contains(QT_ARCH, arm) {
+    DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
+    LIBS += -lX11 -lxcb -lXi
+
+    SOURCES += mousetouchadaptor_x11.cpp
+}
 
 CONFIG += dll no_keywords c++11
 
@@ -17,9 +24,12 @@
     ubuntutoolkitglobal.h \
     tree.h \
     asyncloader.h \
-    asyncloader_p.h
+    asyncloader_p.h \
+    mousetouchadaptor.h \
+    mousetouchadaptor_p.h
 
 SOURCES += \ 
     colorutils.cpp \
     tree.cpp \
-    asyncloader.cpp
+    asyncloader.cpp \
+    mousetouchadaptor.cpp

=== renamed file 'src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp'
--- src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp	2015-11-10 14:42:20 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2015 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,36 +14,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Daniel d'Andrada <[e-mail]>
+ *              Zsombor Egri <[e-mail]>
  */
 
-#include "ucmousetouchadaptor.h"
-#include "uctestextras.h"
+#include "mousetouchadaptor_p.h"
 
+#include <qpa/qplatformnativeinterface.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QCoreApplication>
 #include <QMouseEvent>
 #include <QTest>
 
-using QTest::QTouchEventSequence;
-
-namespace {
-
-Qt::MouseButton translateMouseButton(xcb_button_t detail)
+#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
+    #define ENABLE_TOUCH_EMULATION
+#endif
+
+namespace UbuntuToolkit {
+
+QTouchDevice *MouseTouchAdaptor::m_touchDevice = nullptr;
+
+MouseTouchAdaptorPrivate::~MouseTouchAdaptorPrivate()
 {
-    switch (detail) {
-        case 1: return Qt::LeftButton;
-        case 2: return Qt::MidButton;
-        case 3: return Qt::RightButton;
-        // Button values 4-7 are Wheel events
-        default: return Qt::NoButton;
-    }
+    QCoreApplication::instance()->removeNativeEventFilter(this);
 }
-} // end of anonymous namespace
 
 /*!
  * \qmltype MouseTouchAdaptor
- * \instantiates UCMouseTouchAdaptor
+ * \instantiates MouseTouchAdaptor
  * \inqmlmodule Ubuntu.Test 1.0
  * \ingroup ubuntu-test
  * \brief Singleton type turning mouse events into single finger touch events.
@@ -60,109 +58,49 @@
  * \endqml
  *
  */
-UCMouseTouchAdaptor::UCMouseTouchAdaptor()
-    : QObject(nullptr)
-    , m_leftButtonIsPressed(false)
-    , m_enabled(true)
-{
-    QCoreApplication::instance()->installNativeEventFilter(this);
-
-    UCTestExtras::registerTouchDevice();
-    m_touchDevice = UCTestExtras::m_touchDevice;
-}
-
-bool UCMouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
-                                          void * message, long * /*result*/)
-{
-    if (!m_enabled) {
-        return false;
-    }
-
-    if (eventType != "xcb_generic_event_t") {
-        // wrong backend.
-        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
-        return false;
-    }
-
-    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
-
-    switch (xcbEvent->response_type & ~0x80) {
-        case XCB_BUTTON_PRESS:
-            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
-            break;
-        case XCB_BUTTON_RELEASE:
-            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
-            break;
-        case XCB_MOTION_NOTIFY:
-            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
-            break;
-        default:
-            return false;
-            break;
-    };
-}
-
-bool UCMouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
-{
-    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
-
-    // Just eat the event if it wasn't a left mouse press
-    if (button != Qt::LeftButton)
-        return true;
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
-
-    QPoint windowPos(pressEvent->event_x / targetWindow->devicePixelRatio(), pressEvent->event_y / targetWindow->devicePixelRatio());
-
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
-                                                       false /* autoCommit */);
-    touchEvent.press(0 /* touchId */, windowPos);
-    touchEvent.commit(false /* processEvents */);
-
-    m_leftButtonIsPressed = true;
-    return true;
-}
-
-bool UCMouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
-{
-    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
-
-    // Just eat the event if it wasn't a left mouse release
-    if (button != Qt::LeftButton)
-        return true;
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
-
-    QPoint windowPos(releaseEvent->event_x / targetWindow->devicePixelRatio(), releaseEvent->event_y / targetWindow->devicePixelRatio());
-
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
-                                                       false /* autoCommit */);
-    touchEvent.release(0 /* touchId */, windowPos);
-    touchEvent.commit(false /* processEvents */);
-
-    m_leftButtonIsPressed = false;
-    return true;
-}
-
-bool UCMouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
-{
-    if (!m_leftButtonIsPressed) {
-        return true;
-    }
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
-
-    QPoint windowPos(event->event_x / targetWindow->devicePixelRatio(), event->event_y / targetWindow->devicePixelRatio());
-
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
-                                                       false /* autoCommit */);
-    touchEvent.move(0 /* touchId */, windowPos);
-    touchEvent.commit(false /* processEvents */);
-
-    return true;
-}
-
-QWindow *UCMouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
+MouseTouchAdaptor::MouseTouchAdaptor(QObject *parent)
+    :
+#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
+      QObject(*(new X11MouseTouchAdaptorPrivate), parent)
+#else
+      QObject(*(new MouseTouchAdaptorPrivate), parent)
+#endif
+{
+#ifdef ENABLE_TOUCH_EMULATION
+    registerTouchDevice();
+#else
+    qWarning() << "MouseTouchAdaptor not available on this architecture.";
+#endif
+    Q_D(MouseTouchAdaptor);
+    d->init();
+}
+
+// registers a test touch device, returns true if a device was found/registered
+bool MouseTouchAdaptor::registerTouchDevice()
+{
+    // check if there is any touch device registered in the system
+    if (!m_touchDevice) {
+        QList<const QTouchDevice*> touchDevices = QTouchDevice::devices();
+        Q_FOREACH(const QTouchDevice *device, touchDevices) {
+            if (device->type() == QTouchDevice::TouchScreen) {
+                m_touchDevice = const_cast<QTouchDevice*>(device);
+                return true;
+            }
+        }
+    }
+    // if none, register one
+#ifdef ENABLE_TOUCH_EMULATION
+    if (!m_touchDevice) {
+        m_touchDevice = new QTouchDevice;
+        m_touchDevice->setType(QTouchDevice::TouchScreen);
+        QWindowSystemInterface::registerTouchDevice(m_touchDevice);
+        return true;
+    }
+#endif
+    return false;
+}
+
+QWindow *MouseTouchAdaptorPrivate::findQWindowWithXWindowID(WId windowId)
 {
     QWindowList windowList = QGuiApplication::topLevelWindows();
     QWindow *foundWindow = nullptr;
@@ -185,14 +123,16 @@
  * \qmlproperty bool MouseTouchAdaptor::enabled
  * Enables the mouse to touch conversion functionality. Defaults to true.
  */
-bool UCMouseTouchAdaptor::enabled() const
-{
-    return m_enabled;
-}
-void UCMouseTouchAdaptor::setEnabled(bool value)
-{
-    if (value != m_enabled) {
-        m_enabled = value;
-        Q_EMIT enabledChanged(value);
-    }
-}
+bool MouseTouchAdaptorPrivate::isEnabled() const
+{
+    return enabled;
+}
+void MouseTouchAdaptorPrivate::setEnabled(bool value)
+{
+    Q_UNUSED(value);
+    qWarning() << "MouseTouchAdaptor not available on this architecture, thus cannot be enabled.";
+}
+
+} // namespace UbuntuToolkit
+
+#include "moc_mousetouchadaptor.cpp"

=== renamed file 'src/Ubuntu/Test/plugin/ucmousetouchadaptor.h' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h'
--- src/Ubuntu/Test/plugin/ucmousetouchadaptor.h	2015-10-21 08:33:21 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2015 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,47 +14,50 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Daniel d'Andrada <[e-mail]>
+ *              Zsombor Egri <[e-mail]>
  */
 
 #ifndef MOUSE_TOUCH_ADAPTOR_H
 #define MOUSE_TOUCH_ADAPTOR_H
 
-#include <QtCore/QAbstractNativeEventFilter>
-#include <QWindow>
-#include <xcb/xcb.h>
+#include "ubuntutoolkitglobal.h"
+
+#include <QtCore/QObject>
 
 class QMouseEvent;
 class QTouchDevice;
+class QQmlEngine;
+class QJSEngine;
+
+namespace UbuntuToolkit {
 
 // Transforms QMouseEvents into single-finger QTouchEvents.
-class UCMouseTouchAdaptor : public QObject, public QAbstractNativeEventFilter
+class MouseTouchAdaptorPrivate;
+class UBUNTUTOOLKIT_EXPORT MouseTouchAdaptor : public QObject
 {
     Q_OBJECT
+    Q_PRIVATE_PROPERTY(MouseTouchAdaptor::d_func(), bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
 public:
-    UCMouseTouchAdaptor();
-
-    // Filters mouse events and posts the equivalent QTouchEvents.
-    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;
-
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-
-    bool enabled() const;
-    void setEnabled(bool value);
+    explicit MouseTouchAdaptor(QObject *parent = Q_NULLPTR);
+
+    static bool registerTouchDevice();
+    inline static QTouchDevice *touchDevice()
+    {
+        return m_touchDevice;
+    }
+    static QObject *registerQmlSingleton(QQmlEngine*, QJSEngine*)
+    {
+        return new MouseTouchAdaptor;
+    }
 
 Q_SIGNALS:
     void enabledChanged(bool value);
 
 private:
-
-    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
-    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
-    bool handleMotionNotify(xcb_motion_notify_event_t *event);
-    QWindow *findQWindowWithXWindowID(WId windowId);
-
-    QTouchDevice *m_touchDevice;
-    bool m_leftButtonIsPressed;
-
-    bool m_enabled;
+    Q_DECLARE_PRIVATE(MouseTouchAdaptor)
+    static QTouchDevice *m_touchDevice;
 };
 
+} // namespace UbuntuToolkit
+
 #endif // MOUSE_TOUCH_ADAPTOR_H

=== added file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-04-12 11:09:51 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef MOUSETOUCHADAPTOR_P
+#define MOUSETOUCHADAPTOR_P
+
+#include "mousetouchadaptor.h"
+#include <QtCore/private/qobject_p.h>
+#include <QtCore/QAbstractNativeEventFilter>
+#include <QWindow>
+#include <xcb/xcb.h>
+
+namespace UbuntuToolkit {
+
+class MouseTouchAdaptorPrivate : public QObjectPrivate, public QAbstractNativeEventFilter
+{
+    Q_DECLARE_PUBLIC(MouseTouchAdaptor)
+public:
+    MouseTouchAdaptorPrivate() : QObjectPrivate() {}
+    ~MouseTouchAdaptorPrivate();
+
+    virtual void init() {}
+    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result)
+            { Q_UNUSED(eventType); Q_UNUSED(message); Q_UNUSED(result); return false; }
+    bool isEnabled() const;
+    virtual void setEnabled(bool enabled);
+
+    QWindow *findQWindowWithXWindowID(WId windowId);
+
+    // fields
+    bool enabled{false};
+};
+
+#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
+class X11MouseTouchAdaptorPrivate : public MouseTouchAdaptorPrivate
+{
+    Q_DECLARE_PUBLIC(MouseTouchAdaptor)
+public:
+    X11MouseTouchAdaptorPrivate();
+
+    void init() Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) Q_DECL_OVERRIDE;
+    void setEnabled(bool value);
+
+    bool xi2HandleEvent(xcb_ge_event_t *event);
+    bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
+    bool handleButtonRelease(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
+    bool handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y);
+
+    bool m_leftButtonIsPressed;
+    bool m_triPressModifier;
+
+    bool m_xi2Enabled{false};
+    int m_xi2Minor{-1};
+    int m_xiOpCode, m_xiEventBase, m_xiErrorBase;
+};
+#endif
+
+} // namespace UbuntuToolkit
+
+#endif // MOUSETOUCHADAPTOR_P
+

=== added file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-04-12 11:09:51 +0000
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Zsombor Egri <[e-mail]>
+ */
+
+/* Some parts of the code were copied from the XCB platform plugin of the Qt Toolkit,
+ * which is under the following license:
+ */
+
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the .
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mousetouchadaptor_p.h"
+
+#include <qpa/qplatformnativeinterface.h>
+
+#include <QCoreApplication>
+#include <QMouseEvent>
+#include <QTest>
+
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/XI2proto.h>
+
+using QTest::QTouchEventSequence;
+
+namespace {
+
+const Qt::KeyboardModifiers TRI_PRESS_MODIFIER = Qt::ShiftModifier|Qt::ControlModifier|Qt::AltModifier;
+
+Qt::MouseButton translateMouseButton(xcb_button_t detail)
+{
+    switch (detail) {
+        case 1: return Qt::LeftButton;
+        case 2: return Qt::MidButton;
+        case 3: return Qt::RightButton;
+        // Button values 4-7 are Wheel events
+        default: return Qt::NoButton;
+    }
+}
+
+Qt::KeyboardModifiers translateMofidier(uint32_t mod)
+{
+    Qt::KeyboardModifiers qtMod = Qt::NoModifier;
+
+    if (mod & 0x01) qtMod |= Qt::ShiftModifier;
+    if (mod & 0x04) qtMod |= Qt::ControlModifier;
+    if (mod & 0x08) qtMod |= Qt::AltModifier;
+    if (mod & 0x80) qtMod |= Qt::MetaModifier;
+
+    return qtMod;
+}
+
+} // end of anonymous namespace
+
+
+namespace UbuntuToolkit {
+
+X11MouseTouchAdaptorPrivate::X11MouseTouchAdaptorPrivate()
+    : m_leftButtonIsPressed(false)
+    , m_triPressModifier(false)
+{
+    enabled = true;
+}
+
+void X11MouseTouchAdaptorPrivate::init()
+{
+    QPlatformNativeInterface *nativeInterface = qGuiApp->platformNativeInterface();
+    Display *xDisplay = static_cast<Display*>(nativeInterface->nativeResourceForIntegration("Display"));
+    if (xDisplay && XQueryExtension(xDisplay, "XInputExtension", &m_xiOpCode, &m_xiEventBase, &m_xiErrorBase)) {
+        int xiMajor = 2;
+        m_xi2Minor = 2; // try 2.2 first, needed for TouchBegin/Update/End
+        if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
+            m_xi2Minor = 1; // for smooth scrolling 2.1 is enough
+            if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
+                m_xi2Minor = 0; // for tablet support 2.0 is enough
+                m_xi2Enabled = XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) != BadRequest;
+            } else
+                m_xi2Enabled = true;
+        } else {
+            m_xi2Enabled = true;
+        }
+    }
+
+    QCoreApplication::instance()->installNativeEventFilter(this);
+}
+
+void X11MouseTouchAdaptorPrivate::setEnabled(bool value)
+{
+    if (value != enabled) {
+        enabled = value;
+        Q_EMIT q_func()->enabledChanged(value);
+    }
+}
+
+// Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed:
+// - "pad0" became "extension"
+// - "pad1" and "pad" became "pad0"
+// New and old version of this struct share the following fields:
+// NOTE: API might change again in the next release of xcb in which case this comment will
+// need to be updated to reflect the reality.
+typedef struct qt_xcb_ge_event_t {
+    uint8_t  response_type;
+    uint8_t  extension;
+    uint16_t sequence;
+    uint32_t length;
+    uint16_t event_type;
+} qt_xcb_ge_event_t;
+
+bool xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *ev, int opCode)
+{
+    qt_xcb_ge_event_t *event = (qt_xcb_ge_event_t *)ev;
+    // xGenericEvent has "extension" on the second byte, the same is true for xcb_ge_event_t starting from
+    // the xcb version 1.9.3, prior to that it was called "pad0".
+    if (event->extension == opCode) {
+        // xcb event structs contain stuff that wasn't on the wire, the full_sequence field
+        // adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
+        // Move this data back to have the same layout in memory as it was on the wire
+        // and allow casting, overwriting the full_sequence field.
+        memmove((char*) event + 32, (char*) event + 36, event->length * 4);
+        return true;
+    }
+    return false;
+}
+
+static inline qreal fixed1616ToReal(FP1616 val)
+{
+    return qreal(val) / 0x10000;
+}
+
+bool X11MouseTouchAdaptorPrivate::xi2HandleEvent(xcb_ge_event_t *event)
+{
+    if (!xi2PrepareXIGenericDeviceEvent(event, m_xiOpCode)) {
+        return false;
+    }
+
+    xXIGenericDeviceEvent *xiEvent = reinterpret_cast<xXIGenericDeviceEvent *>(event);
+    xXIDeviceEvent *xiDeviceEvent = 0;
+
+    switch (xiEvent->evtype) {
+    case XI_ButtonPress:
+    case XI_ButtonRelease:
+    case XI_Motion:
+        xiDeviceEvent = reinterpret_cast<xXIDeviceEvent *>(event);
+        break;
+    default:
+        break;
+    }
+
+    if (!xiDeviceEvent) {
+        return false;
+    }
+
+    switch (xiDeviceEvent->evtype) {
+    case XI_ButtonPress:
+        return handleButtonPress(
+                static_cast<WId>(xiDeviceEvent->event),
+                xiDeviceEvent->detail,
+                xiDeviceEvent->mods.base_mods,
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+    case XI_ButtonRelease:
+        return handleButtonRelease(
+                static_cast<WId>(xiDeviceEvent->event),
+                xiDeviceEvent->detail,
+                    xiDeviceEvent->mods.base_mods,
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+    case XI_Motion:
+        return handleMotionNotify(
+                static_cast<WId>(xiDeviceEvent->event),
+                xiDeviceEvent->mods.base_mods,
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+        return true;
+    default:
+        return false;
+    }
+}
+
+bool X11MouseTouchAdaptorPrivate::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+{
+    Q_UNUSED(result);
+    static int eventCount = 0;
+    eventCount++;
+    if (!enabled) {
+        return false;
+    }
+
+    if (eventType != "xcb_generic_event_t") {
+        // wrong backend.
+        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
+        return false;
+    }
+
+    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
+
+    switch (xcbEvent->response_type & ~0x80) {
+        case XCB_BUTTON_PRESS: {
+            auto pressEvent = reinterpret_cast<xcb_button_press_event_t *>(xcbEvent);
+            return handleButtonPress(static_cast<WId>(pressEvent->event), pressEvent->detail, 0,
+                    pressEvent->event_x, pressEvent->event_y);
+        }
+        case XCB_BUTTON_RELEASE: {
+            auto releaseEvent = reinterpret_cast<xcb_button_release_event_t *>(xcbEvent);
+            return handleButtonRelease(static_cast<WId>(releaseEvent->event), releaseEvent->detail, 0,
+                    releaseEvent->event_x, releaseEvent->event_y);
+        }
+        case XCB_MOTION_NOTIFY: {
+            auto motionEvent = reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent);
+            return handleMotionNotify(static_cast<WId>(motionEvent->event), 0,
+                                      motionEvent->event_x, motionEvent->event_y);
+        }
+        case XCB_GE_GENERIC:
+            if (m_xi2Enabled) {
+                return xi2HandleEvent(reinterpret_cast<xcb_ge_event_t *>(xcbEvent));
+            } else {
+                return false;
+            }
+        default:
+            return false;
+    };
+}
+
+bool X11MouseTouchAdaptorPrivate::handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y)
+{
+    Qt::MouseButton button = translateMouseButton(detail);
+    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
+
+    // Just eat the event if it wasn't a left mouse press
+    if (button != Qt::LeftButton)
+        return true;
+
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
+
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
+                                                       false /* autoCommit */);
+    touchEvent.press(0 /* touchId */, windowPos);
+    if (qtMod == TRI_PRESS_MODIFIER) {
+        touchEvent.press(1, windowPos);
+        touchEvent.press(2, windowPos);
+        m_triPressModifier = true;
+    }
+    touchEvent.commit(false /* processEvents */);
+
+    m_leftButtonIsPressed = true;
+    return true;
+}
+
+bool X11MouseTouchAdaptorPrivate::handleButtonRelease(WId windowId, uint32_t detail, uint32_t, int x, int y)
+{
+    Qt::MouseButton button = translateMouseButton(detail);
+
+    // Don't eat the event if it wasn't a left mouse press
+    if (button != Qt::LeftButton)
+        return false;
+
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
+
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
+                                                       false /* autoCommit */);
+    touchEvent.release(0 /* touchId */, windowPos);
+    if (m_triPressModifier) {
+        touchEvent.release(1, windowPos);
+        touchEvent.release(2, windowPos);
+    }
+    touchEvent.commit(false /* processEvents */);
+
+    m_leftButtonIsPressed = false;
+    m_triPressModifier = false;
+    return true;
+}
+
+bool X11MouseTouchAdaptorPrivate::handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y)
+{
+    if (!m_leftButtonIsPressed) {
+        return true;
+    }
+    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
+
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
+
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
+                                                       false /* autoCommit */);
+    touchEvent.move(0 /* touchId */, windowPos);
+    if (m_triPressModifier) {
+        if (qtMod == TRI_PRESS_MODIFIER) {
+            touchEvent.move(1, windowPos);
+            touchEvent.move(2, windowPos);
+        } else {
+            // released modifiers
+            touchEvent.release(1, windowPos);
+            touchEvent.release(2, windowPos);
+            m_triPressModifier = false;
+        }
+    }
+    touchEvent.commit(false /* processEvents */);
+
+    return true;
+}
+
+} // namespace UbuntuToolkit

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py	2016-04-12 11:09:51 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2016 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+from ubuntuuitoolkit import tests
+
+
+class TouchAdaptorTestCase(tests.QMLFileAppTestCase):
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_touchadaptor.qml')
+
+    def get_command_line(self, command_line):
+        command_line.append('-touch')
+        return command_line
+
+    def test_apparent_touch_screen(self):
+        touchArea = self.main_view.select_single(objectName="touchArea")
+        label = self.main_view.select_single(objectName="label")
+        # Trigger handlers as a courtesy to a watching person
+        self.pointing_device.click_object(touchArea)
+        self.assertThat(label.text, Eventually(Equals("Touched")))

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml	2016-04-12 11:09:51 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Page {
+        title: "TouchAdaptor"
+
+        MultiPointTouchArea {
+            id: mpa
+            property bool touched: false
+            anchors.fill: parent
+            mouseEnabled: false
+            objectName: "touchArea"
+            touchPoints: TouchPoint {
+                id: point1
+                onPressedChanged: {
+                    if (pressed) {
+                        label.text = "Touched";
+                    }
+                }
+            }
+
+            Label {
+                id: label
+                objectName: "label"
+                anchors.centerIn: parent
+                text: "Not touched"
+            }
+        }
+    }
+}

=== modified file 'tests/checkresults.sh'
--- tests/checkresults.sh	2016-02-03 16:43:02 +0000
+++ tests/checkresults.sh	2016-04-12 11:09:51 +0000
@@ -17,9 +17,13 @@
 # Author: Christian Dywan <[e-mail]>
 ################################################################################
 
+WARNINGS_PATTERN='message="(.*)" type="qwarn"'
+ERRORS_PATTERN='<failure'
+
 FAILURES=0
-for i in $*; do
-    _XML=$i
+FATAL_WARNINGS=0
+EXCEPTED=0
+for _XML in $*; do
     _TESTNAME=$(basename $_XML | sed -r 's@test_(.+)\.xml@\1@' -)
 
     if [ ! -f $_XML ]; then
@@ -30,6 +34,8 @@
     EXCEPTIONS='tst_components_benchmark \
                 tst_tabbar.qml \
                 tst_datepicker.qml \
+                tst_datepicker13.qml \
+                tst_swipearea \
                 tst_qquick_image_extension \
                 tst_page.qml \
                 tst_toolbar.qml \
@@ -48,26 +54,46 @@
                 tst_inversemousearea \
                 '
 
-    WARNINGS=$(grep -c -e 'qwarn' $_XML)
-    ERRORS=$(grep -c -e '<failure' $_XML)
+    WARNINGS=$(grep -c -P "$WARNINGS_PATTERN" $_XML)
+    ERRORS=$(grep -c -P "$ERRORS_PATTERN" $_XML)
     if [ $ERRORS -ne 0 ]; then
-      echo "Error: $ERRORS errors in $_TESTNAME ($WARNINGS warnings)"
+      FAILURES_FILES="${FAILURES_FILES}  ${_TESTNAME}\n"
       ((FAILURES+=$ERRORS))
-      ((FAILURES+=$WARNINGS))
     elif [ $WARNINGS -ne 0 ]; then
       if [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
-        echo "FIXME: $WARNINGS warnings in $_TESTNAME - Known problematic test"
+        EXCEPTED_FILES="${EXCEPTED_FILES}  ${_TESTNAME}\n"
+        ((EXCEPTED+=$WARNINGS))
       else
-        echo "Error: $WARNINGS warnings in $_TESTNAME"
-        # FIXME: ((FAILURES+=$WARNINGS))
+        FATAL_WARNINGS_FILES="${FATAL_WARNINGS_FILES}  ${_TESTNAME}\n"
+        ((FATAL_WARNINGS+=$WARNINGS))
       fi
     elif [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
-      echo Woot! Known problematic test $_TESTNAME did pass afterall!
-      echo '  ' Consider removing $_TESTNAME from EXCEPTIONS in ${0#$(pwd)/}
+      WOOT_FILES="${WOOT_FILES}  ${_TESTNAME}\n"
     fi
 done
 
-if [ $FAILURES -ne 0 ]; then
-    echo Found $FAILURES failures including warnings.
-    exit $FAILURES
-fi
+TOTAL=0
+if [ -n "$FAILURES_FILES" ]; then
+    ((TOTAL+=$FAILURES))
+    echo $FAILURES failures which MUST be fixed:
+    echo -e "$FAILURES_FILES"
+fi
+
+if [ -n "$FATAL_WARNINGS_FILES" ]; then
+    ((TOTAL+=FATAL_WARNINGS))
+    echo $FATAL_WARNINGS fatal warnings which MUST be fixed:
+    echo -e "$FATAL_WARNINGS_FILES"
+fi
+
+if [ -n "$EXCEPTED_FILES" ]; then
+    echo The following tests issued $EXCEPTED expected warnings:
+    echo -e "$EXCEPTED_FILES"
+fi
+
+if [ -n "$WOOT_FILES" ]; then
+    echo Woot! Known problematic tests passed!
+    echo Consider removing these from EXCEPTIONS in ${0#$(pwd)/}!
+    echo -e "$WOOT_FILES"
+fi
+
+exit $TOTAL

=== modified file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	2015-11-30 15:39:52 +0000
+++ tests/qmlapicheck.sh	2016-04-12 11:09:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/bash
 #
 # Copyright 2013 Canonical Ltd.
 #
@@ -16,7 +16,7 @@
 #
 ################################################################################
 
-. `dirname $0`/../build_paths.inc
+source `dirname $0`/../export_qml_dir.sh || exit 1
 
 if [ ! -e $BUILD_DIR/qml/Ubuntu/Layouts/libUbuntuLayouts.so ]; then
     echo You need to build UITK before you can dump QML API!
@@ -26,7 +26,7 @@
 CPP="Ubuntu.Components Ubuntu.Components.ListItems Ubuntu.Components.Popups Ubuntu.Components.Pickers Ubuntu.Components.Styles Ubuntu.Components.Themes Ubuntu.Layouts Ubuntu.PerformanceMetrics Ubuntu.Test"
 echo Dumping QML API of C++ components
 test -s $BUILD_DIR/components.api.new && rm $BUILD_DIR/components.api.new
-env ALARM_BACKEND=memory QML2_IMPORT_PATH=$BUILD_DIR/qml LD_LIBRARY_PATH=$BUILD_DIR/lib \
+env ALARM_BACKEND=memory \
     $BUILD_DIR/apicheck/apicheck \
     --qml $CPP 1>> $BUILD_DIR/components.api.new &&
     echo Verifying the diff between existing and generated API

=== modified file 'tests/uitk_test_plan.sh' (properties changed: -x to +x)
--- tests/uitk_test_plan.sh	2016-04-04 04:41:23 +0000
+++ tests/uitk_test_plan.sh	2016-04-12 11:09:51 +0000
@@ -203,7 +203,7 @@
 function device_comission {
     if [ ${COMISSION_BOOTSTRAP} == true ]; then
         # bootstrap the device with the latest image
-	ubuntu-device-flash  --revision=399 touch --channel=${CHANNEL} --wipe --bootstrap --developer-mode --password=0000a
+	ubuntu-device-flash touch --serial=${SERIALNUMBER} --channel=${CHANNEL} --wipe --bootstrap --developer-mode --password=0000
     elif [ ${COMISSION_FLASH} == true ]; then
         adb -s ${SERIALNUMBER} wait-for-device
         # Avoid https://bugs.launchpad.net/gallery-app/+bug/1363190
@@ -393,7 +393,7 @@
             RTM=false
             CHANNEL="ubuntu-touch/devel-proposed/ubuntu"
             DISTRO="ubuntu"
-            SERIES="wily"
+            SERIES="xenial"
             ;;
         w)
             DISTUPGRADE=true
@@ -423,7 +423,7 @@
             echo -e "\t-p : Source PPA for the UITK. Default $PPA. Use -p archive to test stock image or -p [0-9]* to set a silo."
             echo -e "\t-f : Filter for the test suite. Default $FILTER"
             echo -e "\t-a : Start the test suite from the given test."
-            echo -e "\t-u : Provision the Development release of Ubuntu, Wily. Default is vivid-overlay (formerly RTM)."
+            echo -e "\t-u : Provision the Development release of Ubuntu, Xenial. Default is vivid-overlay (formerly RTM)."
             echo -e "\t-w : dist-upgrade to the whole PPA instead of just Ubuntu UI Toolkit. Default is only UITK."
             echo -e "\t-q : Provision the device for normal use with the ${PPA} enabled"
             echo ""
@@ -442,13 +442,13 @@
             echo "Validate the UITK from teh archive on an vivid-overlay image"
             echo -e "\t$ ./uitk_test_plan.sh -c -p archive"
             echo ""
-            echo "Validate the UITK from a specific CI silo on an Ubuntu Wily image"
+            echo "Validate the UITK from a specific CI silo on an Ubuntu Xenial image"
             echo -e "\t$ ./uitk_test_plan.sh -c -p 001 -u"
             echo ""
             echo "Provision the device for manual testing with the latest vivid-overlay image"
             echo -e "\t$ ./uitk_test_plan.sh -c -p archive -n"
             echo ""
-            echo "Provision the device for manual testing with the latest Ubuntu Wily image"
+            echo "Provision the device for manual testing with the latest Ubuntu Xenial image"
             echo -e "\t$ ./uitk_test_plan.sh -c -p archive -u -n"
             echo ""
             echo "Run the test plan on an already provisioned device"

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2016-04-04 04:47:11 +0000
+++ tests/unit/runtest.sh	2016-04-12 11:09:51 +0000
@@ -17,23 +17,62 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 ################################################################################
 
-. `dirname $0`/../../build_paths.inc
+set -e
+
+source `dirname $0`/../../export_qml_dir.sh
 
 _CMD=""
 _TARGETPATH=$1
 _TESTFILEPATH=$2
 _MINIMAL=$3
 
-_TARGET=$(basename $1)
-_TESTFILE=$(basename $2)
-_LIB_PATH="${BUILD_DIR}/lib:${BUILD_DIR}/qml/Ubuntu/Components:${BUILD_DIR}/qml/Ubuntu/Test:$LD_LIBRARY_PATH"
-_IMPORT_PATH="${BUILD_DIR}/qml:$QML2_IMPORT_PATH"
-_THEMES_PATH="${BUILD_DIR}/qml"
+relpath() {
+  python -c 'import os, sys; print(os.path.relpath(*sys.argv[1:]))' $*
+}
+
+if [ -z $_TESTFILEPATH ]; then
+  _TESTFILEPATH=$_TARGETPATH
+elif [[ 'minimal custom' == *$_TESTFILEPATH* ]]; then
+  _MINIMAL=$_TESTFILEPATH
+  _TESTFILEPATH=$_TARGETPATH
+fi
+test -z $_MINIMAL && _MINIMAL=default
+
+if [ -z $_TARGETPATH ]; then
+  echo Usage:
+  echo "  $0 TEST_EXECUTABLE [QML_FILE] [QT_QPA_PLATFORM]"
+  echo ''
+  echo 'Examples:'
+  echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/tst_components/tst_components) tst_label13.qml minimal"
+  echo ''
+  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/tst_mainview)"
+  echo "  ../$(basename $0) tst_mainview minimal"
+  echo "  cd ../../.."
+  echo ''
+  echo "  cd $(relpath ${BUILD_DIR}/tests/unit_x11/tst_components)"
+  echo "  ../../xvfb.sh ../../unit/$(basename $0) tst_components tst_listitem13.qml"
+  echo "  cd ../../.."
+  echo ''
+  echo "  $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit_x11/tst_bottomedge/tst_bottomedge)"
+  exit 1
+fi
+
+_TARGET=$(basename $_TARGETPATH)
+_TESTFILE=$(basename $_TESTFILEPATH)
 _XML="${BUILD_DIR}/tests/test_$_TARGET_$_TESTFILE.xml"
 
 _ARGS="-p -o -p $_XML,xunitxml -p -o -p -,txt"
 
-set +e
+function create_fallback_xml {
+  cat << EOF > $_XML
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="1" failures="1" tests="1" name="$_TESTFILE">
+  <testcase result="fail" name="${_TESTFILE}_Execution">
+    <failure message="$1" result="fail"/>
+  </testcase>
+</testsuite>
+EOF
+}
 
 function create_test_cmd {
   if [[ "$_TARGETPATH" = /* ]]; then
@@ -41,23 +80,21 @@
   else
       EXE=./$_TARGETPATH
   fi
-  _CMD="-n $_TESTFILE -m 300"
+  _CMD="-n $_TESTFILE -m 500"
 
   DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
   if [[ ${DEB_HOST_ARCH} =~ 'arm' ]]; then
-    _CMD="dbus-test-runner --task $EXE $_CMD"
+    _CMD="dbus-test-runner --task $(readlink -f $EXE) $_CMD"
   else
     _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"
-    _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"
-  fi
-
-  if [ "$_MINIMAL" = "minimal" ]; then
-      _CMD="$_CMD -p -platform -p minimal"
-  elif [ "$_MINIMAL" = "custom" ]; then
-      _CMD="$_CMD -p -platform -p custom"
-  fi
-
-  if [ $_TARGETPATH != $_TESTFILEPATH ]; then
+    _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $(readlink -f $EXE)"
+  fi
+
+  if [[ 'minimal custom' == *$_MINIMAL* ]]; then
+      _CMD="$_CMD -p -platform -p $_MINIMAL"
+  fi
+
+  if [[ $_TESTFILEPATH == *\.qml* ]]; then
       _CMD="$_CMD -p -input -p $_TESTFILEPATH"
   fi
   _CMD="$_CMD -p -maxwarnings -p 100"
@@ -70,14 +107,18 @@
     echo "Error: $_TARGET wasn't built!"
     RESULT=2
   elif [ $DISPLAY ]; then
+    cd $(dirname $_TARGETPATH)
+
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
 	
-    QML2_IMPORT_PATH=${_IMPORT_PATH} UBUNTU_UI_TOOLKIT_THEMES_PATH=${_THEMES_PATH} \
-    LD_LIBRARY_PATH=${_LIB_PATH} \
     ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
     QT_LOGGING_RULES="[PERFORMANCE].warning=false" \
     $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
+    if [ ! -s $_XML ]; then
+        # Write fallback in case it crashed and the file is empty
+        create_fallback_xml "Test results corrupted (crash)"
+    fi
     if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
         ${BUILD_DIR}/tests/checkresults.sh $_XML
         RESULT=$?
@@ -98,6 +139,8 @@
   return $RESULT
 }
 
+# Always create XML in case the test can't be run, eg. .so file missing
+create_fallback_xml "Test couldn't be run"
 create_test_cmd
 execute_test_cmd
 RESULT=$?

=== modified file 'tests/unit_x11/tst_components/tst_adaptivepagelayout.qml'
--- tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2016-03-07 06:19:27 +0000
+++ tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2016-04-12 11:09:51 +0000
@@ -314,6 +314,7 @@
             ];
         }
         function test_forced_synchronous_loading_bug1540449(data) {
+            layout.asynchronous = false;
             layout[data.func](layout.primaryPage, data.page);
             waitForRendering(layout, 400);
 

=== renamed file 'tests/unit_x11/tst_components/tst_datepicker.qml' => 'tests/unit_x11/tst_components/tst_datepicker12.qml.SEGFAULT.bug1567840'
=== renamed file 'tests/unit_x11/tst_components/tst_datepicker13.qml' => 'tests/unit_x11/tst_components/tst_datepicker13.SEGFAULT.bug1567840'
=== modified file 'tests/unit_x11/tst_components/tst_header.qml'
--- tests/unit_x11/tst_components/tst_header.qml	2016-02-01 21:50:28 +0000
+++ tests/unit_x11/tst_components/tst_header.qml	2016-04-12 11:09:51 +0000
@@ -28,8 +28,8 @@
     Header {
         id: header
         flickable: flickable
-        z:1
-        width: parent.width
+        z: 1
+        width: parent ? parent.width : 234
         height: root.initialHeaderHeight
 
         Rectangle {
@@ -196,6 +196,7 @@
         }
 
         function init() {
+            header.flickable = flickable;
             flickable.contentHeight = 2*flickable.height;
             flickable.interactive = true;
             flickable.contentY = -header.height;
@@ -343,14 +344,72 @@
 
             compare(otherFlickable.topMargin, otherFlickable.initialTopMargin, "Flickable top margin is not initialized properly.");
             header.flickable = otherFlickable;
-            compare(otherFlickable.topMargin, header.height, "Setting flickable does not update flickable top margin.");
-            compare(flickable.topMargin, 0, "Changing the flickable does not reset the previous flickable top margin to 0.");
+            compare(otherFlickable.topMargin, header.height + otherFlickable.initialTopMargin,
+                    "Setting flickable does not update flickable top margin.");
+            compare(flickable.topMargin, 0,
+                    "Changing the flickable does not reset the previous flickable top margin to 0.");
 
             header.flickable = flickable;
             compare(otherFlickable.topMargin, otherFlickable.initialTopMargin, "Reverting flickable does not restore the other flickable top margin.");
             compare(flickable.topMargin, header.height, "Reverting flickable breaks flickable top margin.");
         }
 
+        function test_flickable_margins_invisible_header_bug1560458_bug1560419_data() {
+            return [
+                        { tag: "Inititial topMargin = 0",
+                            flickable: flickable,
+                            initialTopMargin: 0
+                        },
+                        { tag: "Initial topMargin > 0",
+                            flickable: otherFlickable,
+                            initialTopMargin: otherFlickable.initialTopMargin
+                        }
+                    ];
+        }
+
+        function test_flickable_margins_invisible_header_bug1560458_bug1560419(data) {
+            var h = header.height;
+            var fl = data.flickable;
+            // the original margin before the flickable is connected to the header
+            var fmargin = data.initialTopMargin;
+            if (header.flickable !== fl) {
+                compare(fl.topMargin, fmargin,
+                        "Incorrect initial topMargin for flickable.");
+                header.flickable = fl;
+            }
+
+            compare(fl.topMargin, h + fmargin,
+                    "Flickable top margin does not match header height.");
+            header.visible = false;
+            compare(fl.topMargin, fmargin,
+                    "Invisible header sets flickable.topMargin.");
+            header.visible = true;
+            compare(fl.topMargin, h + fmargin,
+                    "Making flickable visible does not set flickable.topMargin.");
+            header.height = 0;
+            compare(fl.topMargin, fmargin,
+                    "Header with height = 0 sets flickable.topMargin.");
+            header.height = h;
+            compare(fl.topMargin, h + fmargin,
+                    "Setting header height does not set flickable.topMargin.");
+
+            // Setting opacity to 0 should not change flickable.topMargin.
+            // This allows opacity animations.
+            header.opacity = 0.0;
+            compare(fl.topMargin, h + fmargin,
+                    "Setting header opacity to 0 changes flickable.topMargin.");
+            header.opacity = 1.0;
+            compare(fl.topMargin, h + fmargin,
+                    "Setting header opacity to 1 changes flickable.topMargin.");
+
+            header.parent = null;
+            compare(fl.topMargin, fmargin,
+                    "Header with no parent sets flickable.topMargin.");
+            header.parent = root;
+            compare(fl.topMargin, h + fmargin,
+                    "Header with parent does not set flickable.topMargin.");
+        }
+
         function test_flickable_contentHeight_bug1156573() {
             var old_height = flickable.contentHeight;
             header.exposed = false;

=== modified file 'tests/unit_x11/tst_components/tst_page_with_header.qml'
--- tests/unit_x11/tst_components/tst_page_with_header.qml	2015-10-14 12:07:15 +0000
+++ tests/unit_x11/tst_components/tst_page_with_header.qml	2016-04-12 11:09:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -31,10 +31,10 @@
             objectName: "my_rectangle"
             id: myRectangle
             anchors {
-                left: parent.left
-                right: parent.right
+                left: parent ? parent.left : undefined
+                right: parent ? parent.right : undefined
             }
-            height: units.gu(6)
+            height: myPageHeader.height
             color: UbuntuColors.red
         }
 
@@ -64,7 +64,7 @@
             anchors {
                 left: parent.left
                 right: parent.right
-                top: parent.top
+                top: page.header ? page.header.bottom : parent.top
                 topMargin: units.gu(10)
                 leftMargin: units.gu(10)
                 rightMargin: units.gu(10)
@@ -126,26 +126,24 @@
 
         function test_page_with_no_header() {
             page.header = null;
-            compare(myPageHeader.parent, invisible,
-                    "Header parent is not correctly reverted when unsetting Page.header.");
-            compare(myPageHeader.visible, false,
-                    "My PageHeader is still visible after re-parenting it to an invisible Item.");
+            compare(myPageHeader.parent, null,
+                    "Header parent is not wet to null when unsetting Page.header.");
             compare(appHeader.visible, true,
                     "AppHeader does not become visible when Page.header is null.");
         }
 
         function test_page_with_alternative_header() {
             page.header = myRectangle;
-            compare(myPageHeader.parent, invisible,
-                    "Header parent not correctly reverted when setting a different Page.header.");
+            compare(myPageHeader.parent, null,
+                    "Header parent not null after setting a different Page.header.");
             compare(myRectangle.parent, page,
                     "Rectangle parent is not correctly set to page after setting it as Page.header.");
             compare(appHeader.visible, false,
                     "Setting a different Page.header Item shows the AppHeader.");
 
             page.header = myPageHeader;
-            compare(myRectangle.parent, invisible,
-                    "Rectangle parent is not correctly reverted after unsetting it as Page.header.");
+            compare(myRectangle.parent, null,
+                    "Rectangle parent is not set to null after unsetting it as Page.header.");
             // myPageHeader parent is checked in cleanup().
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_pageheader.qml'
--- tests/unit_x11/tst_components/tst_pageheader.qml	2015-12-21 13:44:54 +0000
+++ tests/unit_x11/tst_components/tst_pageheader.qml	2016-04-12 11:09:51 +0000
@@ -89,6 +89,7 @@
                 iconName: "attachment"
                 text: "Attach"
                 objectName: "five"
+                enabled: false
             },
             Action {
                 iconName: "contact"
@@ -130,6 +131,7 @@
             z:1
 
             title: "Default title"
+            subtitle: subtitleSwitch.checked ? "This is amaaaaaazing" : ""
             contents: contentsSwitch.checked ? alternativeContents : null
             sections.actions: sectionsSwitch.checked ? root.sectionActions : []
             trailingActionBar.actions: trailingActionsSwitch.checked ?
@@ -231,7 +233,15 @@
                     checked: false
                 }
                 Label {
-                    text: "Resize with window"
+                    text: "resize with window"
+                }
+
+                Switch {
+                    id: subtitleSwitch
+                    checked: false
+                }
+                Label {
+                    text: "subtitle"
                 }
             }
 

=== modified file 'tests/unit_x11/tst_components/tst_pagestack.qml'
--- tests/unit_x11/tst_components/tst_pagestack.qml	2016-01-07 14:55:33 +0000
+++ tests/unit_x11/tst_components/tst_pagestack.qml	2016-04-12 11:09:51 +0000
@@ -34,6 +34,41 @@
                 id: pageInStack
             }
         }
+
+        Column {
+            // for manual testing
+            visible: pageStack.depth === 0
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+                margins: units.gu(1)
+            }
+            Button {
+                text: "page1"
+                onClicked: pageStack.push(page1)
+            }
+            Button {
+                text: "page2"
+                onClicked: pageStack.push(page2)
+            }
+            Button {
+                text: "pageWithPage"
+                onClicked: pageStack.push(pageWithPage)
+            }
+            Button {
+                text: "tabs"
+                onClicked: pageStack.push(tabs)
+            }
+            Button {
+                text: "pageWithHeader"
+                onClicked: pageStack.push(pageWithHeader)
+            }
+            Button {
+                text: "pageComponent"
+                onClicked: pageStack.push(pageComponent)
+            }
+        }
     }
     Page {
         id: page1
@@ -238,19 +273,18 @@
                     "PageStack.push() returns Page created from QML file");
         }
 
-        function test_page_header_back_button() {
+        function test_page_header_back_button_bug1565811() {
             pageStack.push(pageWithHeader);
-            var backButton = findChild(pageWithHeader.header, "pagestack_back_action_button");
-            // FIXME TIM: when visibleActions is fixed, only check for backButton, null.
-            compare(backButton == null || !backButton.visible, true,
+            var backButton = findChild(pageWithHeader.header.leadingActionBar,
+                                       "pagestack_back_action_button");
+            compare(backButton, null,
                     "Page header shows back button with only one page on the stack.");
-
             pageStack.pop();
             pageStack.push(page1);
             pageStack.push(pageWithHeader);
             waitForHeaderAnimation(mainView);
             backButton = findChild(pageWithHeader.header, "pagestack_back_action_button");
-            compare(backButton.visible, true,
+            compare(backButton && backButton.visible, true,
                     "Page header has no back button with two pages on the stack.");
         }
     }

=== modified file 'tests/unit_x11/tst_components/tst_scrollbar_header.qml'
--- tests/unit_x11/tst_components/tst_scrollbar_header.qml	2016-03-30 15:14:32 +0000
+++ tests/unit_x11/tst_components/tst_scrollbar_header.qml	2016-04-12 11:09:51 +0000
@@ -124,7 +124,8 @@
 
                     PageHeader {
                         id: standardHeaderItem
-                        visible: pageItem.header === standardHeaderItem
+                        // hide the header until it is used by the page
+                        parent: null
                         title: "Default title"
                         flickable: flickable_movingHeaderTest
                         trailingActionBar.actions: [
@@ -137,7 +138,8 @@
                     }
                     PageHeader {
                         id: editHeaderItem
-                        visible: pageItem.header === editHeaderItem
+                        // hide the header until it is used by the page
+                        parent: null
                         flickable: flickable_movingHeaderTest
                         property Component delegate: Component {
                             AbstractButton {
@@ -241,14 +243,7 @@
         function test_handlingOfMovingHeader(data) {
             var page = pageItem
             var header = data.header
-
             page.header = header
-            console.log(page.header, header.flickable)
-
-            //make sure the currently tested header is the one driving the flickable changes
-            //FIXME: this should not be needed after #1560458 is fixed
-            header.flickable = null
-            header.flickable = flickable_movingHeaderTest
 
             compare(page.header, header, "Handling of moving header: wrong header.")
             compare(scrollbar_movingHeaderTest.__styleInstance.isVertical, true, "Scrollbar is not vertical.")
@@ -260,9 +255,8 @@
                 checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.head.contents.height, data.tag)
                 return
             } else {
-                header.flickable = flickable_movingHeaderTest
                 compare(header.flickable, flickable_movingHeaderTest, "Wrong PageHeader flickable.")
-                checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag)
+                checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag + ", at initialization.")
             }
 
             var tmpHeaderHeight = header.height
@@ -279,7 +273,6 @@
             //should cover the scrollbar)
             header.flickable = null
             compare(header.flickable, null, "Wrong PageHeader flickable.")
-            expectFailContinue("Standard header", "Waiting on Header bug #1560458")
             checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, 0, data.tag)
 
             //reassign the correct flickable and check again
@@ -289,7 +282,6 @@
 
             header.visible = false
             compare(header.visible, false, "Header visibility did not change, should have been false.")
-            expectFailContinue("", "Waiting on Header bug #1560458")
             checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, 0, data.tag + ", invisible header")
 
             header.visible = true

=== modified file 'tests/unit_x11/tst_layouts/tst_layouts.cpp'
--- tests/unit_x11/tst_layouts/tst_layouts.cpp	2016-01-30 10:51:22 +0000
+++ tests/unit_x11/tst_layouts/tst_layouts.cpp	2016-04-12 11:09:51 +0000
@@ -29,6 +29,7 @@
 #include "ullayouts.h"
 #include "ucunits.h"
 #include "uctestcase.h"
+#include "uctheme.h"
 #include <QtQuick/private/qquickanchors_p.h>
 #include <QtQuick/private/qquickanchors_p_p.h>
 
@@ -95,10 +96,12 @@
 private Q_SLOTS:
     void initTestCase()
     {
+        qputenv("SUPPRESS_DEPRECATED_NOTE", "yes");
     }
 
-    void cleanupTestCase()
+    void cleanup()
     {
+        UCTheme::previousVersion = 0;
     }
 
     void testCase_NoLayouts()
@@ -289,7 +292,8 @@
 
     void testCase_NestedLayouts_ExtraLarge()
     {
-        QTest::ignoreMessage(QtWarningMsg, "\"There are still \"1\" items in the process of being created at engine destruction.\"");
+        QRegularExpression expression(".+ items in the process of being created at engine destruction.+");
+        QTest::ignoreMessage(QtWarningMsg, expression);
         QScopedPointer<QQuickView> view(loadTest("NestedLayouts.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();

=== added file 'tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml'
--- tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml	2016-04-12 11:09:51 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    width: units.gu(50)
+    height: units.gu(40)
+    
+    MouseArea {
+        anchors.fill: parent
+        anchors.margins: units.gu(10)
+        
+        objectName: "FilterOwner"
+        hoverEnabled: true
+        Mouse.enabled: true
+    }
+}
\ No newline at end of file

=== modified file 'tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp'
--- tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2016-02-09 13:15:19 +0000
+++ tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2016-04-12 11:09:51 +0000
@@ -981,6 +981,76 @@
         QTest::mouseRelease(view.data(), Qt::LeftButton, 0, QPoint(x, i));
     }
 
+    //This is to test that entered/exited events are fired as a consequence of a mouse move.
+    //When mouse is PRESSED, in fact, you won't get hover events. Mouse moves have to update
+    //the hovered state (and that will trigger entered()/exited()). This fixes lp:1566378
+    void testCase_enteredExitedOnMouseMove_lp1566378() {
+        QScopedPointer<QQuickView> view(loadTest("EnteredExitedOnMouseMove.qml"));
+        QVERIFY(view);
+        UCMouse *filter = attachedFilter<UCMouse>(view->rootObject(), "FilterOwner");
+        QVERIFY(filter);
+        QSignalSpy pressed(filter, SIGNAL(pressed(QQuickMouseEvent*, QQuickItem*)));
+        QSignalSpy positionChanged(filter, SIGNAL(positionChanged(QQuickMouseEvent*, QQuickItem*)));
+        QSignalSpy entered(filter, SIGNAL(entered(QQuickMouseEvent*, QQuickItem*)));
+        QSignalSpy exited(filter, SIGNAL(exited(QQuickMouseEvent*, QQuickItem*)));
+
+        QObject::connect(filter, SIGNAL(pressed(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent(QQuickMouseEvent*, QQuickItem*)));
+        QObject::connect(filter, SIGNAL(positionChanged(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent2(QQuickMouseEvent*, QQuickItem*)));
+        QObject::connect(filter, SIGNAL(entered(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent3(QQuickMouseEvent*, QQuickItem*)));
+        QObject::connect(filter, SIGNAL(exited(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent3(QQuickMouseEvent*, QQuickItem*)));
+
+        preventDblClick();
+
+        //don't use guPoint(0,0) as it's the same as not passing any point, i.e. it sends mouseMove to the
+        //center of the view
+        QTest::mouseMove(view.data(), guPoint(1, 1));
+        QTest::mouseMove(view.data(), guPoint(15, 15));
+        QTest::waitForEvents();
+
+        QCOMPARE(entered.count(), 1);
+        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
+        QCOMPARE(mouseEvent3Params.pressedButton, Qt::NoButton);
+
+        QTest::mousePress(view.data(), Qt::LeftButton, 0, guPoint(15, 15));
+        QTest::waitForEvents();
+        QCOMPARE(mouseEventParams.handler, QString("EVENT1"));
+        QCOMPARE(mouseEventParams.pressedButton, Qt::LeftButton);
+
+        QTest::mouseMove(view.data(), guPoint(25, 15));
+
+        //go out of the mousearea on the right
+        QTest::mouseMove(view.data(), guPoint(45, 15));
+        QTest::waitForEvents();
+        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
+        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
+        QCOMPARE(exited.count(), 1);
+        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
+        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
+
+        //move back in
+        QTest::mouseMove(view.data(), guPoint(25, 15));
+        QTest::waitForEvents();
+        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
+        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
+        QCOMPARE(entered.count(), 2);
+        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
+        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
+
+        //and out again
+        QTest::mouseMove(view.data(), guPoint(45, 15));
+        QTest::waitForEvents();
+        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
+        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
+        QCOMPARE(exited.count(), 2);
+        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
+        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
+
+        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, guPoint(45, 15));
+        QTest::waitForEvents();
+
+        QCOMPARE(positionChanged.count(), 4);
+    }
+
     void testCase_hoverEvents() {
         QScopedPointer<QQuickView> view(loadTest("HoverEvent.qml"));
         QVERIFY(view);

=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2015-12-11 13:35:10 +0000
+++ ubuntu-sdk.pro	2016-04-12 11:09:51 +0000
@@ -8,7 +8,10 @@
 requires(qtHaveModule(quick))
 load(qt_parts)
 
-SUBDIRS += po documentation app-launch-profiler ubuntu-ui-toolkit-launcher apicheck
+src_uitk_launcher.subdir = ubuntu-ui-toolkit-launcher
+src_uitk_launcher.depends = sub-src
+
+SUBDIRS += po documentation app-launch-profiler src_uitk_launcher apicheck
 
 sub_tests.CONFIG -= no_default_target
 sub_tests.CONFIG -= no_default_install

=== removed file 'ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp'
--- ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp	2014-06-16 09:50:56 +0000
+++ ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,159 +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/>.
- *
- * Authored by: Daniel d'Andrada <[e-mail]>
- *
- */
-
-#include "MouseTouchAdaptor.h"
-
-#include <qpa/qwindowsysteminterface.h>
-
-#include <QtGui/QMouseEvent>
-#include <QtTest/QTest>
-
-using QTest::QTouchEventSequence;
-
-namespace {
-Qt::MouseButton translateMouseButton(xcb_button_t detail)
-{
-    switch (detail) {
-        case 1: return Qt::LeftButton;
-        case 2: return Qt::MidButton;
-        case 3: return Qt::RightButton;
-        // Button values 4-7 are Wheel events
-        default: return Qt::NoButton;
-    }
-}
-} // end of anonymous namespace
-
-MouseTouchAdaptor::MouseTouchAdaptor()
-    : m_leftButtonIsPressed(false)
-{
-    m_touchDevice = new QTouchDevice;
-    m_touchDevice->setType(QTouchDevice::TouchScreen);
-    QWindowSystemInterface::registerTouchDevice(m_touchDevice);
-}
-
-bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
-                                          void * message, long * /*result*/)
-{
-    if (eventType != "xcb_generic_event_t") {
-        // wrong backend.
-        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
-        return false;
-    }
-
-    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
-
-    switch (xcbEvent->response_type & ~0x80) {
-        case XCB_BUTTON_PRESS:
-            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
-            break;
-        case XCB_BUTTON_RELEASE:
-            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
-            break;
-        case XCB_MOTION_NOTIFY:
-            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
-            break;
-        default:
-            return false;
-            break;
-    };
-}
-
-bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
-{
-    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
-
-    // Skip the event if it wasn't a left mouse press
-    if (button != Qt::LeftButton) {
-        return false;
-    }
-
-    QPoint windowPos(pressEvent->event_x, pressEvent->event_y);
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
-
-    // no autoCommit
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
-    touchEvent.press(0, windowPos);
-    // do not process events when committed, let the events be processed with next event loop
-    touchEvent.commit(false);
-
-    m_leftButtonIsPressed = true;
-    return true;
-}
-
-bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
-{
-    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
-
-    // Skip the event if it wasn't a left mouse release
-    if (button != Qt::LeftButton) {
-        return false;
-    }
-
-    QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
-
-    // no autoCommit
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
-    touchEvent.release(0, windowPos);
-    // do not process events when committed, let the events be processed with next event loop
-    touchEvent.commit(false);
-
-    m_leftButtonIsPressed = false;
-    return true;
-}
-
-bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
-{
-    if (!m_leftButtonIsPressed) {
-        return false;
-    }
-
-    QPoint windowPos(event->event_x, event->event_y);
-
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
-
-    // no autoCommit
-    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
-    touchEvent.move(0, windowPos);
-    // do not process events when committed, let the events be processed with next event loop
-    touchEvent.commit(false);
-
-    return true;
-}
-
-QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
-{
-    QWindowList windowList = QGuiApplication::topLevelWindows();
-    QWindow *foundWindow = 0;
-
-    int i = 0;
-    while (!foundWindow && i < windowList.count()) {
-        QWindow *window = windowList[i];
-        if (window->winId() == windowId) {
-            foundWindow = window;
-        } else {
-            ++i;
-        }
-    }
-
-    Q_ASSERT(foundWindow);
-    return foundWindow;
-}

=== removed file 'ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h'
--- ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h	2014-06-16 09:50:56 +0000
+++ ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h	1970-01-01 00:00:00 +0000
@@ -1,50 +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/>.
- *
- * Authored by: Daniel d'Andrada <[e-mail]>
- *
- */
-
-#ifndef MOUSE_TOUCH_ADAPTOR_H
-#define MOUSE_TOUCH_ADAPTOR_H
-
-#include <QtCore/QAbstractNativeEventFilter>
-#include <QWindow>
-#include <xcb/xcb.h>
-
-class QMouseEvent;
-class QTouchDevice;
-
-// Transforms QMouseEvents into single-finger QTouchEvents.
-class MouseTouchAdaptor : public QAbstractNativeEventFilter {
-
-public:
-    MouseTouchAdaptor();
-
-    // Filters mouse events and posts the equivalent QTouchEvents.
-    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);
-
-private:
-
-    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
-    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
-    bool handleMotionNotify(xcb_motion_notify_event_t *event);
-    QWindow *findQWindowWithXWindowID(WId windowId);
-
-    QTouchDevice *m_touchDevice;
-    bool m_leftButtonIsPressed;
-};
-
-#endif // MOUSE_TOUCH_ADAPTOR_H

=== modified file 'ubuntu-ui-toolkit-launcher/launcher.cpp'
--- ubuntu-ui-toolkit-launcher/launcher.cpp	2015-11-13 09:29:40 +0000
+++ ubuntu-ui-toolkit-launcher/launcher.cpp	2016-04-12 11:09:51 +0000
@@ -32,19 +32,10 @@
 #include <QtQuick/private/qsgcontext_p.h>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QCommandLineOption>
-#include "MouseTouchAdaptor.h"
+#include <MouseTouchAdaptor>
 #include <QtGui/QTouchDevice>
 #include <QtQml/qqml.h>
 
-bool touchDevicePresent()
-{
-    Q_FOREACH(const QTouchDevice *device, QTouchDevice::devices()) {
-        if (device->type() == QTouchDevice::TouchScreen)
-            return true;
-    }
-    return false;
-}
-
 static QObject *s_testRootObject = 0;
 static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
 {
@@ -151,9 +142,9 @@
         view->setFlags(Qt::FramelessWindowHint);
     }
 
-    if (args.isSet(_enableTouch) && !touchDevicePresent()) {
+    if (args.isSet(_enableTouch)) {
         // has no effect if we have touch screen
-        application.installNativeEventFilter(new MouseTouchAdaptor);
+        new UbuntuToolkit::MouseTouchAdaptor(&application);
     }
 
     QUrl source(QUrl::fromLocalFile(filename));

=== modified file 'ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro'
--- ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2015-11-19 08:45:15 +0000
+++ ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2016-04-12 11:09:51 +0000
@@ -1,11 +1,9 @@
 TEMPLATE = app
 QT += qml quick
 # For setSharedOpenGLContext
-QT += core-private gui-private testlib quick-private
-CONFIG += no_keywords
-HEADERS += MouseTouchAdaptor.h
-SOURCES += launcher.cpp \
-    MouseTouchAdaptor.cpp
+QT += core-private gui-private testlib quick-private UbuntuToolkit
+CONFIG += no_keywords c++11
+SOURCES += launcher.cpp
 installPath = $$[QT_INSTALL_PREFIX]/bin
 launcher.path = $$installPath
 launcher.files = ubuntu-ui-toolkit-launcher