Merge lp:~tpeeters/ubuntu-ui-toolkit/revert-ap16 into lp:ubuntu-ui-toolkit

[Tim Peeters]

Undo the MR to support AP1.6.

Undo the MR to support AP1.6 because AP1.6 is not ready yet.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2015-08-18 21:07:56 +0000
+++ .bzrignore	2015-09-22 15:57:54 +0000
@@ -21,5 +21,5 @@
 tests/unit/tst_i18n/*/share/locale/en/LC_MESSAGES/*.mo
 tests/unit/tst_units/dpr*/dpr*
 tests/apicheck/apicheck
-tests/launcher/launcher
+ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher
 build_paths.inc

=== modified file 'components.api'
--- components.api	2015-09-04 12:35:16 +0000
+++ components.api	2015-09-22 15:57:54 +0000
@@ -1244,6 +1244,12 @@
     property bool locked
     property bool opened
     property Item pageStack
+Ubuntu.Components.UCApplication 1.0 0.1: QtObject
+    property string applicationName
+    property QtObject inputMethod
+Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
+    function double sizeToPixels(string size)
+    function double modularScale(string size)
 UCListItemDivider: Item
     property color colorFrom
     property color colorTo

=== modified file 'debian/control'
--- debian/control	2015-08-20 08:10:44 +0000
+++ debian/control	2015-09-22 15:57:54 +0000
@@ -120,7 +120,7 @@
 Package: ubuntu-ui-toolkit-examples
 Section: devel
 Architecture: any
-Depends: qmlscene,
+Depends: ubuntu-ui-toolkit-tools (>= ${source:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (= ${binary:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
          qml-module-qtquick-xmllistmodel | qtdeclarative5-xmllistmodel-plugin,
@@ -160,3 +160,15 @@
          qml-module-qttest | qtdeclarative5-test-plugin,
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package
+
+Package: ubuntu-ui-toolkit-tools
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt Components for Ubuntu - productive tools
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the application launcher, which is a drop-in
+ replacement for qmlscene, oxideqmlscene, qml and derivatives.
+

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2015-04-29 13:02:11 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2015-09-22 15:57:54 +0000
@@ -1,3 +1,2 @@
 usr/lib/python3
 usr/lib/*/ubuntu-ui-toolkit/apicheck
-usr/lib/*/ubuntu-ui-toolkit/launcher

=== added file 'debian/ubuntu-ui-toolkit-tools.install'
--- debian/ubuntu-ui-toolkit-tools.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-ui-toolkit-tools.install	2015-09-22 15:57:54 +0000
@@ -0,0 +1,1 @@
+usr/bin/ubuntu-ui-toolkit-launcher

=== modified file 'examples/ubuntu-ui-toolkit-gallery/gallery'
--- examples/ubuntu-ui-toolkit-gallery/gallery	2015-08-11 15:42:46 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery	2015-09-22 15:57:54 +0000
@@ -3,4 +3,4 @@
 . `dirname $0`/../../build_paths.inc
 
 SCRIPT_DIRECTORY=`dirname $0`
-$BUILD_DIR/tests/launcher/launcher $@ $SCRIPT_DIRECTORY/ubuntu-ui-toolkit-gallery.qml
+$BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/ubuntu-ui-toolkit-gallery.qml

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop	2014-11-17 11:52:44 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop	2015-09-22 15:57:54 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Ubuntu UI Toolkit Gallery
-Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml
+Exec=/usr/bin/ubuntu-ui-toolkit-launcher $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true

=== modified file 'src/Ubuntu/Components/1.0/Icon.qml'
--- src/Ubuntu/Components/1.0/Icon.qml	2015-07-24 09:53:20 +0000
+++ src/Ubuntu/Components/1.0/Icon.qml	2015-09-22 15:57:54 +0000
@@ -55,19 +55,19 @@
         }
 
         cache: true
-        visible: !colorizedImage.active
+        visible: !colorizedImage.visible
     }
 
     ShaderEffect {
         id: colorizedImage
+        objectName: "shader"
 
         anchors.fill: parent
-        visible: active
 
         // Whether or not a color has been set.
-        property bool active: keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
+        visible: image.status == Image.Ready && keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
 
-        property Image source: active && image.status == Image.Ready ? image : null
+        property Image source: image
         property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
         property color keyColorIn: "#808080"
         property real threshold: 0.1

=== modified file 'src/Ubuntu/Components/1.2/TextInputPopover.qml'
--- src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-08-19 06:55:11 +0000
+++ src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-09-22 15:57:54 +0000
@@ -83,13 +83,6 @@
             model: actions.length
             AbstractButton {
                 id: button
-                /*
-                  Workaround for autopilot used in the text input's context menu to access
-                  action.text so we can get the proper button by text, action being not
-                  accessible. https://bugs.launchpad.net/autopilot/+bug/1334599
-                  */
-                // FIXME: AbstractButton has text property, which is getting the action.text, so no need to override!
-                property string text: action.text
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]

=== modified file 'src/Ubuntu/Components/1.3/PageWrapperUtils.js'
--- src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-09-01 11:59:13 +0000
+++ src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-09-22 15:57:54 +0000
@@ -73,6 +73,7 @@
     if (incubator.status != Component.Ready) {
         incubator.onStatusChanged = incubatorStatusChanged;
     } else {
+        pageWrapper.incubator = this;
         incubatorStatusChanged(incubator.status);
     }
 }
@@ -103,9 +104,15 @@
             throw new Error("Error while loading page: " + pageComponent.errorString());
         } else {
             // create the object
-            pageWrapper.incubator = new Incubator(pageWrapper, pageComponent);
             if (synchronous) {
-                pageWrapper.incubator.forceCompletion();
+                if (pageWrapper.properties) {
+                    // initialize the object with the given properties
+                    pageWrapper.object = pageComponent.createObject(pageWrapper, pageWrapper.properties);
+                } else {
+                    pageWrapper.object = pageComponent.createObject(pageWrapper);
+                }
+            } else {
+                pageWrapper.incubator = new Incubator(pageWrapper, pageComponent);
             }
             pageWrapper.canDestroy = true;
         }

=== modified file 'src/Ubuntu/Components/1.3/TextInputPopover.qml'
--- src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-07-02 23:33:22 +0000
+++ src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-09-22 15:57:54 +0000
@@ -83,12 +83,6 @@
             model: actions.length
             AbstractButton {
                 id: button
-                /*
-                  Workaround for autopilot used in the text input's context menu to access
-                  action.text so we can get the proper button by text, action being not
-                  accessible. https://bugs.launchpad.net/autopilot/+bug/1334599
-                  */
-                property string text: action.text
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]

=== modified file 'src/Ubuntu/Components/Popups/1.2/ActionSelectionPopover.qml'
--- src/Ubuntu/Components/Popups/1.2/ActionSelectionPopover.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/Popups/1.2/ActionSelectionPopover.qml	2015-09-22 15:57:54 +0000
@@ -147,8 +147,10 @@
                 onStatusChanged: {
                     if (item && status == Loader.Ready) {
                         // set model data
-                        if (item.hasOwnProperty("action"))
+                        if (item.hasOwnProperty("action")) {
                             item.action = modelData;
+                            item.objectName = item.action.objectName + '_button';
+                        }
                         if (item.hasOwnProperty("refModelData"))
                             item.refModelData = modelData;
                         if (item.hasOwnProperty("modelData"))

=== modified file 'src/Ubuntu/Components/Popups/1.2/PopupBase.qml'
--- src/Ubuntu/Components/Popups/1.2/PopupBase.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/Popups/1.2/PopupBase.qml	2015-09-22 15:57:54 +0000
@@ -161,6 +161,7 @@
     }
 
     MouseArea {
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: __foreground
         onWheel: wheel.accepted = true
     }

=== modified file 'src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml'
--- src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml	2015-05-14 21:32:51 +0000
+++ src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml	2015-09-22 15:57:54 +0000
@@ -147,8 +147,10 @@
                 onStatusChanged: {
                     if (item && status == Loader.Ready) {
                         // set model data
-                        if (item.hasOwnProperty("action"))
+                        if (item.hasOwnProperty("action")) {
                             item.action = modelData;
+                            item.objectName = item.action.objectName + '_button';
+                        }
                         if (item.hasOwnProperty("refModelData"))
                             item.refModelData = modelData;
                         if (item.hasOwnProperty("modelData"))

=== modified file 'src/Ubuntu/Components/Popups/1.3/PopupBase.qml'
--- src/Ubuntu/Components/Popups/1.3/PopupBase.qml	2015-04-29 08:55:31 +0000
+++ src/Ubuntu/Components/Popups/1.3/PopupBase.qml	2015-09-22 15:57:54 +0000
@@ -161,6 +161,7 @@
     }
 
     MouseArea {
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: __foreground
         onWheel: wheel.accepted = true
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-09-04 09:32:31 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-09-22 15:57:54 +0000
@@ -70,7 +70,7 @@
                 }
 
                 readonly property real maxItemWidth: parent.width / itemActions.actions.length
-                readonly property real minItemWidth: units.gu(5) // 2GU icon + 2* 1.5GU margin
+                readonly property real minItemWidth: units.gu(6) // 2GU icon + 2* 2GU margin
 
                 Repeater {
                     model: itemActions.actions

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-08-31 15:43:14 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-09-22 15:57:54 +0000
@@ -163,7 +163,9 @@
 {
     qmlRegisterType<UCAction>(uri, major, minor, "Action");
     qmlRegisterType<UCActionContext>(uri, major, minor, "ActionContext");
+    qmlRegisterUncreatableType<UCApplication>(uri, major, minor, "UCApplication", "Not instantiable");
     qmlRegisterType<UCActionManager>(uri, major, minor, "ActionManager");
+    qmlRegisterUncreatableType<UCFontUtils>(uri, major, minor, "UCFontUtils", "Not instantiable");
     qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItem");
     qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");

=== modified file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp	2015-08-31 15:43:14 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp	2015-09-22 15:57:54 +0000
@@ -123,7 +123,8 @@
                                      "No dragging will be possible.");
     }
     if (start) {
-        pViewAttached->buildChangesList(false);
+        // keep the mouse event in house
+        setKeepMouseGrab(true);
         fromIndex = toIndex = index;
         lastPos = pos;
         // create temp drag item
@@ -152,7 +153,7 @@
         }
     }
     // unlock flickables
-    pViewAttached->clearChangesList();
+    setKeepMouseGrab(false);
     // perform drop
     UCListItemPrivate::get(item.data())->dragHandler->drop();
     item = 0;

=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-08-20 17:08:49 +0000
+++ src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-09-22 15:57:54 +0000
@@ -220,8 +220,11 @@
 {
     QVariantMap res;
     const QHash<int, QByteArray> roles = roleNames();
-    for(int role = 0; role < roles.count(); role++)
-        res.insert (roles[role], data(row, role));
+    QHashIterator<int, QByteArray> i(roles);
+    while (i.hasNext()) {
+        i.next();
+        res.insert(i.value(), data(row, i.key()));
+    }
     return res;
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-25 11:31:29 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-09-22 15:57:54 +0000
@@ -16,6 +16,10 @@
 
 #include "ucactionitem.h"
 #include "ucaction.h"
+#include "ucstyleditembase_p.h"
+#define foreach Q_FOREACH
+#include <QtQml/private/qqmlbinding_p.h>
+#undef foreach
 
 /*!
  * \qmltype ActionItem
@@ -40,8 +44,14 @@
     , m_action(Q_NULLPTR)
     , m_flags(0)
 {
-    connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
-    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::enabledChanged2);
+    connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::visibleChanged2);
+}
+
+bool UCActionItem::hasBindingOnProperty(const QString &name)
+{
+    QQmlProperty property(this, name, qmlContext(this));
+    return QQmlPropertyPrivate::binding(property) != Q_NULLPTR;
 }
 
 void UCActionItem::componentComplete()
@@ -55,40 +65,47 @@
     }
 }
 
-void UCActionItem::_q_visibleChanged()
-{
-    m_flags |= CustomVisible;
-    disconnect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
-}
-
-void UCActionItem::_q_enabledChanged()
-{
-    m_flags |= CustomEnabled;
-    disconnect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
-}
-
 // update visible property
-void UCActionItem::_q_updateVisible()
+void UCActionItem::_q_visibleBinding()
 {
+    if (m_flags & CustomVisible) {
+        return;
+    }
+    if (hasBindingOnProperty(QStringLiteral("visible"))) {
+        m_flags |= CustomEnabled;
+        return;
+    }
     bool visible = m_action ? m_action->m_visible : true;
     setVisible(visible);
-    // reset flag and reconnect signal handler disconnected by the
-    m_flags &= ~CustomVisible;
-    if (m_action) {
-        connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
-    }
 }
 
 // update enabled property
-void UCActionItem::_q_updateEnabled()
+void UCActionItem::_q_enabledBinding()
 {
+    if (m_flags & CustomEnabled) {
+        return;
+    }
+    if (hasBindingOnProperty(QStringLiteral("enabled"))) {
+        m_flags |= CustomEnabled;
+        return;
+    }
     bool enabled = m_action ? m_action->m_enabled : true;
     setEnabled(enabled);
-    // reset flag and reconnect signal handler disconnected by the
-    m_flags &= ~CustomEnabled;
-    if (m_action) {
-        connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
-    }
+}
+
+// setter called when bindings from QML set the value. Internal functions will
+// all use the setVisible setter, so initialization and (re)parenting related
+// visible alteration won't set the custom flag
+void UCActionItem::setVisible2(bool visible)
+{
+    // set the custom flag and forward the value to the original proepry setter
+    m_flags |= CustomVisible;
+    setVisible(visible);
+}
+void UCActionItem::setEnabled2(bool enabled)
+{
+    m_flags |= CustomEnabled;
+    setEnabled(enabled);
 }
 
 void UCActionItem::updateProperties()
@@ -109,10 +126,14 @@
     if (attach) {
         connect(this, SIGNAL(triggered(QVariant)),
                 m_action, SLOT(trigger(QVariant)), Qt::DirectConnection);
-        connect(m_action, &UCAction::visibleChanged,
-                this, &UCActionItem::_q_updateVisible, Qt::DirectConnection);
-        connect(m_action, &UCAction::enabledChanged,
-                this, &UCActionItem::_q_updateEnabled, Qt::DirectConnection);
+        if (!(m_flags & CustomVisible)) {
+            connect(m_action, &UCAction::visibleChanged,
+                    this, &UCActionItem::_q_visibleBinding, Qt::DirectConnection);
+        }
+        if (!(m_flags & CustomEnabled)) {
+            connect(m_action, &UCAction::enabledChanged,
+                    this, &UCActionItem::_q_enabledBinding, Qt::DirectConnection);
+        }
         if (!(m_flags & CustomText)) {
             connect(m_action, &UCAction::textChanged,
                     this, &UCActionItem::textChanged, Qt::DirectConnection);
@@ -128,10 +149,14 @@
     } else {
         disconnect(this, SIGNAL(triggered(QVariant)),
                    m_action, SLOT(trigger(QVariant)));
-        disconnect(m_action, &UCAction::visibleChanged,
-                   this, &UCActionItem::_q_updateVisible);
-        disconnect(m_action, &UCAction::enabledChanged,
-                   this, &UCActionItem::_q_updateEnabled);
+        if (!(m_flags & CustomVisible)) {
+            disconnect(m_action, &UCAction::visibleChanged,
+                       this, &UCActionItem::_q_visibleBinding);
+        }
+        if (!(m_flags & CustomEnabled)) {
+            disconnect(m_action, &UCAction::enabledChanged,
+                       this, &UCActionItem::_q_enabledBinding);
+        }
         if (!(m_flags & CustomText)) {
             disconnect(m_action, &UCAction::textChanged,
                        this, &UCActionItem::textChanged);
@@ -167,8 +192,8 @@
     if (m_action) {
         attachAction(true);
     }
-    _q_updateVisible();
-    _q_updateEnabled();
+    _q_visibleBinding();
+    _q_enabledBinding();
     updateProperties();
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.h'
--- src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-25 11:31:29 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-09-22 15:57:54 +0000
@@ -26,6 +26,10 @@
     Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
     Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource RESET resetIconSource NOTIFY iconSourceChanged)
     Q_PROPERTY(QString iconName READ iconName WRITE setIconName RESET resetIconName NOTIFY iconNameChanged)
+
+    // overrides
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled2 NOTIFY enabledChanged2)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible2 NOTIFY visibleChanged2 FINAL)
 public:
     explicit UCActionItem(QQuickItem *parent = 0);
 
@@ -40,6 +44,9 @@
     void setIconName(const QString &iconName);
     void resetIconName();
 
+    void setVisible2(bool visible);
+    void setEnabled2(bool enabled);
+
 Q_SIGNALS:
     void actionChanged();
     void textChanged();
@@ -47,14 +54,15 @@
     void iconNameChanged();
     void triggered(const QVariant &value);
 
+    void enabledChanged2();
+    void visibleChanged2();
+
 public Q_SLOTS:
     void trigger(const QVariant &value = QVariant());
 
 protected Q_SLOTS:
-    void _q_visibleChanged();
-    void _q_enabledChanged();
-    void _q_updateVisible();
-    void _q_updateEnabled();
+    void _q_visibleBinding();
+    void _q_enabledBinding();
 
 protected:
     enum {
@@ -72,6 +80,7 @@
 
     void componentComplete();
 
+    bool hasBindingOnProperty(const QString &name);
     void updateProperties();
     void attachAction(bool attach);
 };

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-09-04 09:32:31 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2015-09-22 15:57:54 +0000
@@ -474,7 +474,7 @@
     if (parentAttached) {
         Q_Q(UCListItem);
         // restore flickable's interactive and cleanup
-        parentAttached->disableInteractive(q, false);
+        q->setKeepMouseGrab(false);
         // no need to listen flickables any longer
         listenToRebind(false);
     }
@@ -1123,7 +1123,7 @@
 
 // grabs the left mouse button event by turning highlight on, and triggering
 // swipe events; child items should no longer get mouse events
-void UCListItemPrivate::grabLeftButtonEvents(QMouseEvent *event)
+void UCListItemPrivate::handleLeftButtonPress(QMouseEvent *event)
 {
     Q_Q(UCListItem);
     button = event->button();
@@ -1133,11 +1133,15 @@
     lastPos = pressedPos = event->localPos();
     // connect the Flickable to know when to rebound
     listenToRebind(true);
-    if (swiped && parentAttached) {
-        parentAttached->disableInteractive(q, true);
+    if (swiped) {
+        // grab now, and ungrab in snapOut
+        q->setKeepMouseGrab(true);
+        q->grabMouse();
     }
     // stop any ongoing animation!
     swipeEvent(event->localPos(), UCSwipeEvent::Started);
+    // accept the event so we get the rest of the events as well
+    event->accept();
 }
 
 void UCListItem::mousePressEvent(QMouseEvent *event)
@@ -1150,10 +1154,8 @@
         return;
     }
     if (d->canHighlight() && !d->highlighted && event->button() == Qt::LeftButton) {
-        d->grabLeftButtonEvents(event);
+        d->handleLeftButtonPress(event);
     }
-    // accept the event so we get the rest of the events as well
-    event->setAccepted(true);
 }
 
 bool UCListItem13::shouldShowContextMenu(QMouseEvent *event)
@@ -1203,15 +1205,16 @@
 }
 
 // ungrabs any previously grabbed left mouse button event
-void UCListItemPrivate::ungrabLeftButtonEvents(QMouseEvent *event)
+void UCListItemPrivate::handleLeftButtonRelease(QMouseEvent *event)
 {
     Q_Q(UCListItem);
     // set released
     if (highlighted) {
         // unblock ascending Flickables
         listenToRebind(false);
-        if (parentAttached) {
-            parentAttached->disableInteractive(q, false);
+        q->setKeepMouseGrab(false);
+        if (window && window->mouseGrabberItem() == q) {
+            q->ungrabMouse();
         }
 
         if (!suppressClick) {
@@ -1231,15 +1234,14 @@
         }
     }
     button = Qt::NoButton;
+    event->accept();
 }
 
 void UCListItem::mouseReleaseEvent(QMouseEvent *event)
 {
     UCStyledItemBase::mouseReleaseEvent(event);
     Q_D(UCListItem);
-    d->ungrabLeftButtonEvents(event);
-    // make sure we ungrab the mouse!
-    ungrabMouse();
+    d->handleLeftButtonRelease(event);
 }
 
 void UCListItem13::mouseReleaseEvent(QMouseEvent *event)
@@ -1275,9 +1277,7 @@
         if (d->swipedOverThreshold(event->localPos(), d->pressedPos)) {
             // the press went out of the threshold area, enable move, if the direction allows it
             d->lastPos = event->localPos();
-            if (d->parentAttached) {
-                d->parentAttached->disableInteractive(this, true);
-            }
+            setKeepMouseGrab(true);
             qreal mouseX = event->localPos().x();
             qreal pressedX = d->pressedPos.x();
             bool doSwipe = (d->leadingActions && (mouseX > pressedX)) ||
@@ -1298,42 +1298,81 @@
     }
 }
 
+bool UCListItemPrivate::sendMouseEvent(QQuickItem *item, QMouseEvent *event)
+{
+    Q_UNUSED(item);
+    Q_Q(UCListItem);
+    QQuickItem *grabber = window ? window->mouseGrabberItem() : Q_NULLPTR;
+    if (grabber == q) {
+        // already the grabber, return
+        return true;
+    }
+
+    bool consumed = false;
+    if (contentItem->contains(contentItem->mapFromScene(event->windowPos()))) {
+        QPointF localPos = q->mapFromScene(event->windowPos());
+
+        switch (event->type()) {
+        case QEvent::MouseButtonPress: {
+            // remember pressed point over active areas
+            if (event->button() == Qt::LeftButton) {
+                if (swiped) {
+                    // handle as full press and grab the event from the children
+                    QScopedPointer<QMouseEvent> mouseEvent(QQuickWindowPrivate::cloneMouseEvent(event, &localPos));
+                    handleLeftButtonPress(mouseEvent.data());
+                    consumed = true;
+                } else {
+                    // remember the position
+                    pressedPos = localPos;
+                    button = event->button();
+                }
+            }
+            break;
+        }
+        case QEvent::MouseButtonRelease: {
+            QScopedPointer<QMouseEvent> mouseEvent(QQuickWindowPrivate::cloneMouseEvent(event, &localPos));
+            handleLeftButtonRelease(mouseEvent.data());
+            suppressClick = false;
+            break;
+        }
+        case QEvent::MouseMove: {
+            if ((button == Qt::LeftButton) && swipedOverThreshold(localPos, pressedPos) && !highlighted) {
+                // grab the event from the child, so the click doesn't happen anymore, and initiate swiping
+                QMouseEvent pressed(QEvent::MouseButtonPress, localPos, event->windowPos(), event->screenPos(),
+                                        Qt::LeftButton, event->buttons(), event->modifiers());
+                handleLeftButtonPress(&pressed);
+                // grab any further events so all land in the list item
+                q->setKeepMouseGrab(true);
+                q->grabMouse();
+                consumed = true;
+            }
+            break;
+        }
+        default: break;
+        }
+    }
+
+    return consumed;
+}
+
 bool UCListItem::childMouseEventFilter(QQuickItem *child, QEvent *event)
 {
-    QEvent::Type type = event->type();
+    if (!isVisible() || !isEnabled()) {
+        return UCStyledItemBase::childMouseEventFilter(child, event);
+    }
+
     Q_D(UCListItem);
-    if (type == QEvent::MouseButtonPress) {
-        // suppress click event if pressed over an active area, except Text, which can also handle
-        // mouse clicks when content is an URL
-        QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
-        if (child->isEnabled() && (child->acceptedMouseButtons() & mouse->button()) && !qobject_cast<QQuickText*>(child)) {
-            // suppress click
-            d->suppressClick = true;
-            // listen for flickable to be able to rebind if movement started there!
-            d->listenToRebind(true);
-            // if left button pressed, remember the position
-            if (mouse->button() == Qt::LeftButton) {
-                d->pressedPos = mapFromItem(child, mouse->localPos());
-                d->button = mouse->button();
-            }
-        }
-    } else if (type == QEvent::MouseButtonRelease) {
-        Q_D(UCListItem);
-        d->suppressClick = false;
-    } else if (type == QEvent::MouseMove) {
-        QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
-        const QPointF localPos = mapFromItem(child, mouse->localPos());
-        if ((mouse->buttons() & Qt::LeftButton) && d->swipedOverThreshold(localPos, d->pressedPos) && !d->highlighted) {
-            // grab the event from the child, so the click doesn't happen anymore, and initiate swiping
-            QMouseEvent pressed(QEvent::MouseButtonPress, localPos, mouse->windowPos(), mouse->screenPos(),
-                                    Qt::LeftButton, mouse->buttons(), mouse->modifiers());
-            d->grabLeftButtonEvents(&pressed);
-            // stop click and pressAndHold, then grab the mouse so children do not get the mouse events anymore
-            d->suppressClick = true;
-            d->pressAndHoldTimer.stop();
-            grabMouse();
-        }
-    }
+    switch (event->type()) {
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonRelease: {
+        if (d->sendMouseEvent(child, static_cast<QMouseEvent*>(event))) {
+            return true;
+        }
+    }
+    default: break;
+    }
+
     return UCStyledItemBase::childMouseEventFilter(child, event);
 }
 

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.h'
--- src/Ubuntu/Components/plugin/uclistitem.h	2015-09-04 09:32:31 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.h	2015-09-22 15:57:54 +0000
@@ -180,7 +180,6 @@
     static UCViewItemsAttached *qmlAttachedProperties(QObject *owner);
 
     bool listenToRebind(UCListItem *item, bool listen);
-    void disableInteractive(UCListItem *item, bool disable);
     bool isMoving();
     bool isBoundTo(UCListItem *item);
 

=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2015-09-01 07:16:59 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2015-09-22 15:57:54 +0000
@@ -68,8 +68,9 @@
     void snapOut();
     void swipeEvent(const QPointF &localPos, UCSwipeEvent::Status status);
     bool swipedOverThreshold(const QPointF &mousePos, const QPointF relativePos);
-    void grabLeftButtonEvents(QMouseEvent *event);
-    void ungrabLeftButtonEvents(QMouseEvent *event);
+    void handleLeftButtonPress(QMouseEvent *event);
+    void handleLeftButtonRelease(QMouseEvent *event);
+    bool sendMouseEvent(QQuickItem *item, QMouseEvent *event);
 
     quint16 defaultThemeVersion;
     bool highlighted:1;
@@ -138,8 +139,6 @@
 
     void clearFlickablesList();
     void buildFlickablesList();
-    void clearChangesList();
-    void buildChangesList(const QVariant &newValue);
     bool addSelectedItem(UCListItem *item);
     bool removeSelectedItem(UCListItem *item);
     bool isItemSelected(UCListItem *item);
@@ -157,13 +156,10 @@
     QSet<int> selectedList;
     QMap<int, QPointer<UCListItem13> > expansionList;
     QList< QPointer<QQuickFlickable> > flickables;
-    QList< PropertyChange* > changes;
     QPointer<UCListItem> boundItem;
-    QPointer<UCListItem> disablerItem;
     QQuickFlickable *listView;
     ListItemDragArea *dragArea;
     UCViewItemsAttached::ExpansionFlags expansionFlags;
-    bool globalDisabled:1;
     bool selectable:1;
     bool draggable:1;
     bool ready:1;

=== modified file 'src/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-09-04 08:55:29 +0000
+++ src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-09-22 15:57:54 +0000
@@ -105,7 +105,6 @@
     , listView(0)
     , dragArea(0)
     , expansionFlags(UCViewItemsAttached::Exclusive)
-    , globalDisabled(false)
     , selectable(false)
     , draggable(false)
     , ready(false)
@@ -114,7 +113,6 @@
 
 UCViewItemsAttachedPrivate::~UCViewItemsAttachedPrivate()
 {
-    clearChangesList();
     clearFlickablesList();
 }
 
@@ -155,33 +153,6 @@
     }
 }
 
-void UCViewItemsAttachedPrivate::clearChangesList()
-{
-    // clear property change objects
-    qDeleteAll(changes);
-    changes.clear();
-}
-
-void UCViewItemsAttachedPrivate::buildChangesList(const QVariant &newValue)
-{
-    // collect all ascendant flickables
-    Q_Q(UCViewItemsAttached);
-    QQuickItem *item = qobject_cast<QQuickItem*>(q->parent());
-    if (!item) {
-        return;
-    }
-    clearChangesList();
-    while (item) {
-        QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(item);
-        if (flickable) {
-            PropertyChange *change = new PropertyChange(item, "interactive");
-            PropertyChange::setValue(change, newValue);
-            changes << change;
-        }
-        item = item->parentItem();
-    }
-}
-
 /*!
  * \qmltype ViewItems
  * \instantiates UCViewItemsAttached
@@ -252,41 +223,6 @@
     return d->boundItem == item;
 }
 
-/*
- * Disable/enable interactive flag for the ascendant flickables. The item is used
- * to detect whether the same item is trying to enable the flickables which disabled
- * it before. The enabled/disabled states are not equivalent to the enabled/disabled
- * state of the interactive flag.
- * When disabled, always the last item disabling will be kept as active disabler,
- * and only the active disabler can enable (restore) the interactive flag state.
- */
-void UCViewItemsAttached::disableInteractive(UCListItem *item, bool disable)
-{
-    Q_D(UCViewItemsAttached);
-    if (disable) {
-        // disabling or re-disabling
-        d->disablerItem = item;
-        if (d->globalDisabled == disable) {
-            // was already disabled, leave
-            return;
-        }
-        d->globalDisabled = true;
-    } else if (d->globalDisabled && d->disablerItem == item) {
-        // the one disabled it will enable
-        d->globalDisabled = false;
-        d->disablerItem.clear();
-    } else {
-        // !disabled && (!globalDisabled || item != d->disablerItem)
-        return;
-    }
-    if (disable) {
-        // (re)build changes list with disabling the interactive value
-        d->buildChangesList(false);
-    } else {
-        d->clearChangesList();
-    }
-}
-
 void UCViewItemsAttached::unbindItem()
 {
     Q_D(UCViewItemsAttached);

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-06-23 13:22:10 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-09-22 15:57:54 +0000
@@ -34,6 +34,11 @@
 class AppHeader(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """AppHeader Autopilot custom proxy object."""
 
+    def __init__(self, *args):
+        super().__init__(*args)
+        if not hasattr(self, 'useDeprecatedToolbar'):
+            self.useDeprecatedToolbar = None
+
     def ensure_visible(self):
         if not self._is_visible():
             self._show()

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-09-07 13:46:58 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-09-22 15:57:54 +0000
@@ -81,16 +81,37 @@
 class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """ActionSelectionPopover Autopilot custom proxy object."""
 
+    def click_action_button(self, action_object_name):
+        """Click an action button on the popover.
+
+        :parameter object_name: The QML objectName property of the action
+        :raise ToolkitException: If there is no visible button with that object
+            name or the popover is not open.
+
+        """
+
+        if not self.visible:
+            raise _common.ToolkitException('The popover is not open.')
+        try:
+            object_name = action_object_name + "_button"
+            button = self.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException(
+                'Action with objectName "{0}" not found.'.format(object_name))
+        self.pointing_device.click_object(button)
+        if self.autoClose:
+            try:
+                self.visible.wait_for(False)
+            except dbus.StateNotFoundError:
+                # The popover was removed from the tree.
+                pass
+
     def click_button_by_text(self, text):
         """Click a button on the popover.
 
-        XXX We are receiving the text because there's no way to set the
-        objectName on the action. This is reported at
-        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-        --elopio - 2013-07-25
-
         :parameter text: The text of the button.
-        :raise ToolkitException: If the popover is not open.
+        :raise ToolkitException: If there is no visible button with that label
+            or the popover is not open.
 
         """
         if not self.visible:

=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2015-09-22 15:57:54 +0000
@@ -61,13 +61,12 @@
 def get_toolkit_launcher_command():
     root = ubuntuuitoolkit.tests.get_path_to_build_root()
     path_to_local_launcher = os.path.join(
-        root, 'tests', 'launcher', 'launcher')
+        root, 'ubuntu-ui-toolkit-launcher', 'ubuntu-ui-toolkit-launcher')
     if os.path.exists(path_to_local_launcher):
         return path_to_local_launcher
     else:
-        arch = ubuntuuitoolkit.base.get_host_multiarch()
         path_to_installed_launcher = os.path.join(
-            '/', 'usr', 'lib', arch, 'ubuntu-ui-toolkit', 'launcher')
+            '/', 'usr', 'bin', 'ubuntu-ui-toolkit-launcher')
     return path_to_installed_launcher
 
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-07-29 09:50:33 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-09-22 15:57:54 +0000
@@ -204,8 +204,7 @@
         return orientationHelper
 
     def checkPageHeader(self, pageTitle):
-        orientationHelper = self.getOrientationHelper()
-        header_label = orientationHelper.select_single(
+        header_label = self.main_view.select_single(
             objectName="header_title_label", text=pageTitle)
         self.assertThat(header_label, Not(Is(None)))
         self.assertThat(header_label.visible, Eventually(Equals(True)))

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2015-09-22 15:57:54 +0000
@@ -51,19 +51,30 @@
         actions: ActionList {
             Action {
                 text: "Action one"
+                objectName: "actionOne"
                 onTriggered: label.text = "Button clicked."
+            },
+            Action {
+                text: "Action two"
+                objectName: "actionDisabled"
+                onTriggered: label.text = "Disabled button clicked."
+            },
+            Action {
+                text: "Action three"
+                objectName: "actionHidden"
+                onTriggered: label.text = "Hidden button clicked."
             }
         }
     }
 }
 """)
 
-    def test_action_selection_popover_custom_proxy_object(self):
+    def test_custom_proxy_object(self):
         popover = self.main_view.get_action_selection_popover(
             'test_actions_popover')
         self.assertIsInstance(popover, popups.ActionSelectionPopover)
 
-    def test_click_action_select_popover_button(self):
+    def test_click_button_by_label(self):
         label = self.app.select_single('Label', objectName='clicked_label')
         self.assertNotEqual(label.text, 'Button clicked.')
         self._open_popover()
@@ -72,6 +83,49 @@
         popover.click_button_by_text('Action one')
         self.assertEqual(label.text, 'Button clicked.')
 
+    def test_click_button_by_object_name(self):
+        label = self.app.select_single('Label', objectName='clicked_label')
+        self.assertNotEqual(label.text, 'Button clicked.')
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        popover.click_action_button('actionOne')
+        self.assertEqual(label.text, 'Button clicked.')
+
+    def test_click_unexisting_button_by_object_name(self):
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            popover.click_action_button, 'actionTwo')
+        self.assertEqual(
+            str(error),
+            'Action with objectName "actionTwo" not found.')
+
+    def test_click_disabled_button_by_object_name(self):
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        # Disabled actions are not shown in ActionSelectionPopover
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            popover.click_action_button, 'actionDisabled')
+        self.assertEqual(
+            str(error),
+            'Action with objectName "actionDisabled" not found.')
+
+    def test_click_hidden_button_by_object_name(self):
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            popover.click_action_button, 'actionHidden')
+        self.assertEqual(
+            str(error),
+            'Action with objectName "actionHidden" not found.')
+
     def _open_popover(self):
         open_button = self.main_view.select_single(
             'Button', objectName='open_popover')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.1.3.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.1.3.qml	2015-09-07 15:46:58 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.1.3.qml	2015-09-22 15:57:54 +0000
@@ -20,7 +20,6 @@
 MainView {
     width: units.gu(70)
     height: units.gu(60)
-    useDeprecatedToolbar: true
     objectName: "mainView"
 
     Tabs {
@@ -29,33 +28,33 @@
             objectName: "tab1"
             title: "Tab1"
             Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+                head.actions: [
+                    Action {
                         text: "Test1"
                     }
-                }
+                ]
             }
         }
         Tab {
             objectName: "tab2"
             title: "Tab2"
             Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+                head.actions: [
+                    Action {
                         text: "Test2"
                     }
-                }
+                ]
             }
         }
         Tab {
             objectName: "tab3"
             title: "Tab3"
             Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
+                head.actions: [
+                    Action {
                         text: "Test3"
                     }
-                }
+                ]
             }
         }
     }

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2015-09-07 15:46:58 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2015-09-22 15:57:54 +0000
@@ -28,10 +28,12 @@
     dir_path = os.path.dirname(path)
     deprecated_tabbar_test_qml_file_path = os.path.join(
         dir_path, 'test_tabs.TabsTestCase.deprecated_TabBar.qml')
-    deprecated_tabbar_test_qml_file_path = os.path.join(
+    deprecated_tabbar_1_3_test_qml_file_path = os.path.join(
         dir_path, 'test_tabs.TabsTestCase.deprecated_TabBar.1.3.qml')
     new_header_test_qml_file_path = os.path.join(
         dir_path, 'test_tabs.TabsTestCase.new_header.qml')
+    new_header_1_3_test_qml_file_path = os.path.join(
+        dir_path, 'test_tabs.TabsTestCase.new_header.1.3.qml')
 
     scenarios = [
         ('deprecated TabBar',
@@ -39,7 +41,7 @@
         ('deprecated TabBar 1.3',
          dict(test_qml_file_path=deprecated_tabbar_1_3_test_qml_file_path)),
         ('new header',
-         dict(test_qml_file_path=new_header_test_qml_file_path))
+         dict(test_qml_file_path=new_header_test_qml_file_path)),
         ('new header 1.3',
          dict(test_qml_file_path=new_header_1_3_test_qml_file_path))
     ]

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-07-30 13:27:32 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-09-22 15:57:54 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Styles 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Styles 1.2
 import QtQuick.Layouts 1.1
 
 MainView {
@@ -263,6 +263,11 @@
                         Label {
                             text: modelData + " Flickable item"
                         }
+                        Button {
+                            text: "Pressme..."
+                            anchors.centerIn: parent
+                        }
+
                         onClicked: divider.visible = !divider.visible
                     }
                 }

=== added file 'tests/resources/navigation/Blackbox.qml'
--- tests/resources/navigation/Blackbox.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/navigation/Blackbox.qml	2015-09-22 15:57:54 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(60)
+    Component.onCompleted: pageStack.push(page1)
+
+    PageStack {
+        id: pageStack
+    }
+
+    Page {
+        id: page1
+        title: "one"
+        Button {
+            anchors.centerIn: parent
+            text: "next"
+            onClicked: pageStack.push(page2)
+        }
+    }
+    Page {
+        id: page2
+        title: "two"
+        visible: false
+
+        head.backAction: Action {
+            iconName: "back"
+            onTriggered: pageStack.pop()
+        }
+    }
+}

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2015-05-20 14:47:16 +0000
+++ tests/tests.pro	2015-09-22 15:57:54 +0000
@@ -4,8 +4,6 @@
 autopilot_module.path = /usr/lib/python3/dist-packages/ubuntuuitoolkit
 autopilot_module.files = autopilot/ubuntuuitoolkit/*
 
-SUBDIRS += launcher
-
 SUBDIRS += apicheck
 
 INSTALLS += autopilot_module

=== modified file 'tests/uitk_test_plan.sh'
--- tests/uitk_test_plan.sh	2015-07-13 08:04:32 +0000
+++ tests/uitk_test_plan.sh	2015-09-22 15:57:54 +0000
@@ -32,7 +32,7 @@
 SERIES="vivid"
 CHANNEL="ubuntu-touch/rc-proposed/${DISTRO}"
 PASSWORD="0000"
-BOOTTIME=500
+BOOTTIME=250
 ONLYCOMPARE=false
 DISTUPGRADE=false
 BOOTSTRAP=false
@@ -56,7 +56,7 @@
 # comment out if filemanager AP:s broken
 #   " filemanager"
 #    " ubuntu_terminal_app"
-    " -n unity8"
+#    " -n unity8"
     " ubuntu_clock_app"
 #    " -p dialer-app-autopilot dialer_app"
 #    " -p reminders-app-autopilot reminders"
@@ -78,7 +78,7 @@
              reminders-app-autopilot \
              address-book-app-autopilot \
 #             messaging-app-autopilot \
-             unity8-autopilot \
+#             unity8-autopilot \
              dialer-app-autopilot \
              camera-app-autopilot \
              webbrowser-app-autopilot \
@@ -89,6 +89,12 @@
              ubuntu-system-settings-online-accounts-autopilot"
 #             messaging-app-autopilot \
 
+declare -a UNREGISTERED_APPS=(
+	"com.ubuntu.terminal"
+	"com.ubuntu.calculator"
+	"com.ubuntu.shorts"
+)
+
 fatal_failure () {
     echo -e "\e[31mFailed operation:\e[0m $1"
     exit
@@ -178,10 +184,13 @@
     network
     adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S reboot 2>&1|grep -v password"
     sleep_indicator 120
-    # Required for at least rtm-14.09/mako, phablet-click-test-setup fails otherwise and we don't need terminal
-    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister com.ubuntu.terminal 2>&1|grep -v password"
-    # Enable if calculator AP:s broken, to prevent phablet-click-test-setup trying to check out its tests.
-    #adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister com.ubuntu.calculator 2>&1|grep -v password"
+    # Unregister few apps as they break phablet-click-test-setup or something else
+    echo -e "Unregister few apps"
+    for APP_TO_UNREGISTER in "${UNREGISTERED_APPS[@]}"
+    do
+	echo -e "\e[31m${APP_TO_UNREGISTER}\e[0m"
+	adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister ${APP_TO_UNREGISTER} 2>&1|grep -v password"
+    done
     echo -e "phablet-click-test-setup  \e[31m${DISTRO} ${SERIES}\e[0m"
     phablet-click-test-setup -s ${SERIALNUMBER} --distribution=${DISTRO} --series=${SERIES} 2>&1 || fatal_failure "phablet-click-test-setup has failed" 
     echo "Sleep after phablet-click-test-setup";
@@ -200,6 +209,9 @@
             network
             # TODO: hide the sudo output
             adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/ci-train-ppa-service/landing-${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/silo-${PPA}.list'  2>&1|grep -v password > /dev/null "
+            # pin up the silo
+            adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S  bash -c 'echo -e \"Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-landing-${PPA}\nPin-Priority: 1100\" > /etc/apt/preferences.d/silo.pref' 2>&1|grep -v password > /dev/null "
+            # Resynchronize the package index files from their sources.
             adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
         else
             echo  -e "Set up with the PPA \e[31m${PPA}\e[0m"
@@ -208,7 +220,6 @@
             network
             adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S  bash -c 'echo \"deb http://ppa.launchpad.net/${PPA}/${DISTRO} ${SERIES} main\" > /etc/apt/sources.list.d/testing-ppa.list' 2>&1|grep -v password > /dev/null"
             adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S apt-get update 2>&1|grep -v password > /dev/null"
-
         fi
     fi
     adb -s ${SERIALNUMBER} shell rm -rf /home/phablet/autopilot/ubuntuuitoolkit

=== modified file 'tests/unit_x11/tst_components/ListItemTestCase.qml'
--- tests/unit_x11/tst_components/ListItemTestCase.qml	2015-09-02 13:18:51 +0000
+++ tests/unit_x11/tst_components/ListItemTestCase.qml	2015-09-22 15:57:54 +0000
@@ -82,6 +82,10 @@
         spyWait();
     }
 
+    function tugNoWait(item, x, y, dx, dy) {
+        TestExtras.touchDrag(0, item, Qt.point(x, y), Qt.point(dx, dy));
+    }
+
     // returns the leading or trailing panel item
     function panelItem(item, leading) {
         return findInvisibleChild(item, (leading ? "ListItemPanelLeading" : "ListItemPanelTrailing"));

=== modified file 'tests/unit_x11/tst_components/ListItemTestCase13.qml'
--- tests/unit_x11/tst_components/ListItemTestCase13.qml	2015-09-02 10:55:46 +0000
+++ tests/unit_x11/tst_components/ListItemTestCase13.qml	2015-09-22 15:57:54 +0000
@@ -76,12 +76,26 @@
         flick(item, x, y, dx, dy, 0, 0, undefined, undefined, 100);
     }
 
+    // touch swipes
+    function swipeTouch(touchId, item, x, y, dx, dy) {
+        setupSpy(item, "contentMovementEnded");
+        flickTouch(touchId, item, x, y, dx, dy, 0, 100);
+        spyWait();
+    }
+    function swipeTouchNoWait(touchId, item, x, y, dx, dy) {
+        flickTouch(touchId, item, x, y, dx, dy, 0, 100);
+    }
+
     function tug(item, x, y, dx, dy) {
         setupSpy(item, "contentMovementEnded");
         TestExtras.touchDrag(0, item, Qt.point(x, y), Qt.point(dx, dy));
         spyWait();
     }
 
+    function tugNoWait(item, x, y, dx, dy) {
+        TestExtras.touchDrag(0, item, Qt.point(x, y), Qt.point(dx, dy));
+    }
+
     // returns the leading or trailing panel item
     function panelItem(item, leading) {
         return findInvisibleChild(item, (leading ? "ListItemPanelLeading" : "ListItemPanelTrailing"));

=== renamed file 'tests/unit/tst_components/tst_actionitem.qml' => 'tests/unit_x11/tst_components/tst_actionitem.qml'
--- tests/unit/tst_components/tst_actionitem.qml	2015-08-18 16:58:41 +0000
+++ tests/unit_x11/tst_components/tst_actionitem.qml	2015-09-22 15:57:54 +0000
@@ -18,86 +18,182 @@
 import QtTest 1.0
 import Ubuntu.Components 1.1
 
-TestCase {
-     name: "ActionItemAPI"
-
-     SignalSpy {
-         id: triggerSpy
-         target: action1
-         signalName: "triggered"
-     }
-
-     function initTestCase() {
-         compare(item1.action, null, "action is null by default")
-         compare(item1.text, "", "text is empty string set by default")
-         compare(item1.iconSource, "", "iconSource is empty string by default")
-         compare(item1.iconName, "", "iconSource is empty string by default")
-     }
-
-     function cleanup() {
-         item1.action = null;
-         triggerSpy.clear();
-     }
-
-     function test_action() {
-         compare(item1.action, null,"Action is null by default")
-         item1.action = action1
-         compare(item1.action, action1, "Action can be set")
-         compare(item1.text, action1.text, "text is automatically set to action text")
-         compare(item1.iconSource, action1.iconSource, "iconSource is automatically set to action iconSource")
-         item1.triggered(null)
-         triggerSpy.wait(400);
-     }
-
-     // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
-     // not update the text
-     function test_text() {
-         compare(item1.text, "", "text is empty string by default")
-         var newText = "new text"
-         item1.text = newText
-         compare(item1.text, newText, "text can be set")
-         item1.text = ""
-         compare(item1.text, "", "text can be unset")
-     }
-
-     // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
-     // will not update the iconSource
-     function test_iconSource() {
-         compare(item1.iconSource, "", "iconSource is empty string by default")
-         var newIconSource = Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/small_avatar.png")
-         item1.iconSource = newIconSource
-         compare(item1.iconSource, newIconSource, "iconSource can be set")
-         item1.iconSource = ""
-         compare(item1.iconSource, "", "iconSource can be unset")
-     }
-
-     // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
-     // will not update the iconName
-     function test_iconName() {
-         compare(item1.iconName, "", "iconName is empty string by default")
-         var newIconName = "compose"
-         item1.iconName = newIconName
-         compare(item1.iconName, newIconName, "iconName can be set")
-         item1.iconName = ""
-         compare(item1.iconName, "", "iconName can be unset")
-     }
-
-     function test_signal_triggered() {
-         signalSpy.signalName = "triggered";
-         compare(signalSpy.valid,true,"triggered signal exists")
-     }
-
-     ActionItem {
-         id: item1
-         SignalSpy {
-             id: signalSpy
-             target: parent
-         }
-     }
-
-     Action {
-         id: action1
-         text: "actionText"
-         iconSource: "imageURL"
-     }
+Item {
+    id: main
+    width: units.gu(20)
+    height: units.gu(20)
+
+    property bool customVisible: true
+    property bool customEnabled: true
+
+    ActionItem {
+        id: item1
+        SignalSpy {
+            id: signalSpy
+            target: parent
+        }
+    }
+
+    Component {
+        id: dynamicItem
+        ActionItem {
+            action: action1
+        }
+    }
+    Component {
+        id: dynamicItem2
+        ActionItem {
+            action: action1
+            visible: customVisible
+            enabled: customEnabled
+        }
+    }
+
+    Action {
+        id: action1
+        objectName: "action1"
+        text: "actionText"
+        iconSource: "imageURL"
+    }
+    Action {
+        id: action2
+        objectName: "action2"
+    }
+
+    Loader {
+        id: loader
+        asynchronous: false
+    }
+
+    TestCase {
+        id: testCase
+        when: windowShown
+        name: "ActionItemAPI"
+
+        SignalSpy {
+            id: triggerSpy
+            target: action1
+            signalName: "triggered"
+        }
+
+        function initTestCase() {
+            compare(item1.action, null, "action is null by default")
+            compare(item1.text, "", "text is empty string set by default")
+            compare(item1.iconSource, "", "iconSource is empty string by default")
+            compare(item1.iconName, "", "iconSource is empty string by default")
+        }
+
+        function cleanup() {
+            loader.sourceComponent = null;
+            item1.action = null;
+            action1.visible = true;
+            action1.enabled = true;
+            action2.visible = true;
+            action2.enabled = true;
+            main.customEnabled = true;
+            main.customVisible = true;
+            triggerSpy.clear();
+        }
+
+        function test_action() {
+            compare(item1.action, null,"Action is null by default")
+            item1.action = action1
+            compare(item1.action, action1, "Action can be set")
+            compare(item1.text, action1.text, "text is automatically set to action text")
+            compare(item1.iconSource, action1.iconSource, "iconSource is automatically set to action iconSource")
+            item1.triggered(null)
+            triggerSpy.wait(400);
+        }
+
+        // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
+        // not update the text
+        function test_text() {
+            compare(item1.text, "", "text is empty string by default")
+            var newText = "new text"
+            item1.text = newText
+            compare(item1.text, newText, "text can be set")
+            item1.text = ""
+            compare(item1.text, "", "text can be unset")
+        }
+
+        // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
+        // will not update the iconSource
+        function test_iconSource() {
+            compare(item1.iconSource, "", "iconSource is empty string by default")
+            var newIconSource = Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/small_avatar.png")
+            item1.iconSource = newIconSource
+            compare(item1.iconSource, newIconSource, "iconSource can be set")
+            item1.iconSource = ""
+            compare(item1.iconSource, "", "iconSource can be unset")
+        }
+
+        // NOTE: This test must be run AFTER test_action(), otherwise setting the action will
+        // will not update the iconName
+        function test_iconName() {
+            compare(item1.iconName, "", "iconName is empty string by default")
+            var newIconName = "compose"
+            item1.iconName = newIconName
+            compare(item1.iconName, newIconName, "iconName can be set")
+            item1.iconName = ""
+            compare(item1.iconName, "", "iconName can be unset")
+        }
+
+        function test_signal_triggered() {
+            signalSpy.signalName = "triggered";
+            compare(signalSpy.valid,true,"triggered signal exists")
+        }
+
+        function test_default_bindings_visible_enabled_data() {
+            return [
+                        {tag: "visible", property: "visible"},
+                        {tag: "enabled", property: "enabled"},
+                    ];
+        }
+        function test_default_bindings_visible_enabled(data) {
+            item1.action = action1;
+            action1[data.property] = false;
+            compare(item1[data.property], action1[data.property], "The item1 and action1 '" + data.property + "' value differs");
+        }
+
+        function test_custom_bindings_visible_enabled_bug1495408_data() {
+            return [
+                {tag: "visible", component: dynamicItem, property: "visible"},
+                {tag: "enabled", component: dynamicItem, property: "enabled"},
+                {tag: "visible binding", component: dynamicItem2, property: "visible", customProperty: "customVisible"},
+                {tag: "enabled binding", component: dynamicItem2, property: "enabled", customProperty: "customEnabled"},
+            ];
+        }
+        function test_custom_bindings_visible_enabled_bug1495408(data) {
+            loader.sourceComponent = data.component;
+            var item = loader.item;
+            compare(item[data.property], action1[data.property], "The item and action1 '" + data.property + "' value differs");
+            if (data.customProperty) {
+                main[data.customProperty] = false;
+            } else {
+                item[data.property] = false;
+            }
+            // change the action so the internal bindings are updated
+            item.action = action2;
+            expectFail(data.tag, "default binding must be broken");
+            compare(item[data.property], item.action[data.property], "The item's and action's '" + data.property + "' value is the same");
+        }
+        function test_custom_bindings_visible_enabled_reparenting_bug1495408_data() {
+            return [
+                {tag: "visible binding", component: dynamicItem2, property: "visible"},
+                {tag: "enabled binding", component: dynamicItem2, property: "enabled"},
+            ];
+        }
+        function test_custom_bindings_visible_enabled_reparenting_bug1495408(data) {
+            loader.sourceComponent = dynamicItem2;
+            var item = loader.item;
+            compare(item[data.property], item.action[data.property], "The item and item.action '" + data.property + "' value differs");
+            // then reparent
+            item.parent = item1;
+            // change the action property
+
+            item.action[data.property] = false;
+            expectFail(data.tag, "default binding must be broken");
+            compare(item[data.property], item.action[data.property], "The item and action2 '" + data.property + "' value is the same");
+        }
+    }
 }

=== modified file 'tests/unit_x11/tst_components/tst_icon.qml'
--- tests/unit_x11/tst_components/tst_icon.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_icon.qml	2015-09-22 15:57:54 +0000
@@ -64,6 +64,11 @@
         name: "Icon"
         when: windowShown
 
+        SignalSpy {
+            id: shaderSpy
+            signalName: 'onStatusChanged'
+        }
+
         function cleanup() {
             icon2.name = "";
         }
@@ -93,5 +98,35 @@
                     "file:///usr/share/icons/suru/actions/scalable/search.svg",
                     "Source of the image should equal icon2.source.");
         }
+
+        function test_keyColor() {
+            icon.visible = true;
+            var image = findChild(icon, "image");
+            var shader = findChild(icon, "shader");
+            shaderSpy.target = shader;
+
+            compare(icon.name, 'search');
+            compare(shader.visible, false);
+            compare(shader.status, ShaderEffect.Uncompiled)
+            icon.color = UbuntuColors.orange;
+            shaderSpy.wait();
+            compare(shader.status, ShaderEffect.Compiled)
+            compare(shader.keyColorOut, icon.color);
+            compare(shader.visible, true);
+            compare(shader.source, image);
+            icon.keyColor = UbuntuColors.purple;
+            compare(shader.keyColorIn, icon.keyColor);
+            // Unsetting the icon name should disable the shader
+            icon.name = '';
+            compare(icon.source, '');
+            compare(shader.visible, false);
+            // Let's get back to a valid source
+            icon.name = 'search';
+            compare(shader.visible, true);
+            compare(shader.source, image);
+            // Unsetting the keyColor should also disable the shader
+            icon.color = Qt.rgba(0.0, 0.0, 0.0, 0.0);
+            compare(shader.visible, false);
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-09-02 06:47:25 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-09-22 15:57:54 +0000
@@ -198,8 +198,8 @@
             signalName: "onTriggered"
         }
         SignalSpy {
-            id: interactiveSpy
-            signalName: "interactiveChanged"
+            id: flickableSpy
+            signalName: "movementStarted"
         }
 
         SignalSpy {
@@ -227,7 +227,7 @@
             actionSpy.clear();
             pressAndHoldSpy.clear();
             buttonSpy.clear();
-            interactiveSpy.clear();
+            flickableSpy.clear();
             listView.interactive = true;
             listView.ViewItems.selectMode = false;
             listView.ViewItems.dragMode = false;
@@ -235,8 +235,8 @@
             mouseClick(defaults, 0, 0)
             movingSpy.target = null;
             movingSpy.clear();
-            interactiveSpy.target = null;
-            interactiveSpy.clear();
+            flickableSpy.target = null;
+            flickableSpy.clear();
             trailing.delegate = null;
             listView.positionViewAtBeginning();
             // keep additional timeout for proper cleanup
@@ -434,6 +434,7 @@
             rebound(data.clickOn, data.item)
         }
 
+        // the function tests whether the Flickable/ListView moves when the ListItem is swiped
         function test_listview_not_interactive_while_tugged_data() {
             var item0 = findChild(listView, "listItem0");
             var item1 = findChild(listView, "listItem1");
@@ -446,17 +447,15 @@
         }
         function test_listview_not_interactive_while_tugged(data) {
             listView.positionViewAtBeginning();
-            interactiveSpy.target = listView;
+            flickableSpy.target = listView;
             compare(listView.interactive, true, "ListView is not interactive");
-            interactiveSpy.target = listView;
             if (data.mouse) {
-                swipe(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
+                swipe(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
             } else {
-                tug(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
+                tug(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
             }
             // animation should no longer be running!
-            compare(listView.interactive, true, "The ListView is still non-interactive!");
-            compare(interactiveSpy.count, 2, "Less/more times changed!");
+            compare(flickableSpy.count, 0, "Flickable moved!");
             // check if it snapped in
             verify(data.item.contentItem.x != 0.0, "Not snapped in!!");
             // dismiss
@@ -629,7 +628,7 @@
             wait(2000);
             verify(data.item.contentItem.x != data.item.contentItem.anchors.leftMargin, "Not snapped in");
 
-            var panel = panelItem(data.item, "Leading");
+            var panel = panelItem(data.item, true);
             var action = findChild(panel, "leading_2");
             verify(action, "actions panel cannot be reached");
             // we test the action closest to the list item's contentItem
@@ -724,11 +723,12 @@
         function test_listitem_blocks_ascendant_flickables() {
             var listItem = findChild(nestedListView, "listItem0");
             verify(listItem, "Cannot find test item");
-            interactiveSpy.target = testFlickable;
+            flickableSpy.target = testFlickable;
             // tug leading
             swipe(listItem, centerOf(listItem).x, centerOf(listItem).y, listItem.width / 2, 0);
             // check if interactive got changed
-            interactiveSpy.wait();
+            expectFailContinue("", "Flickable should not move");
+            flickableSpy.wait(200);
 
             // cleanup!!!
             rebound(listItem);

=== modified file 'tests/unit_x11/tst_components/tst_listitem13.qml'
--- tests/unit_x11/tst_components/tst_listitem13.qml	2015-09-02 10:55:46 +0000
+++ tests/unit_x11/tst_components/tst_listitem13.qml	2015-09-22 15:57:54 +0000
@@ -198,8 +198,8 @@
             signalName: "onTriggered"
         }
         SignalSpy {
-            id: interactiveSpy
-            signalName: "interactiveChanged"
+            id: flickableSpy
+            signalName: "movementStarted"
         }
 
         SignalSpy {
@@ -227,7 +227,7 @@
             actionSpy.clear();
             pressAndHoldSpy.clear();
             buttonSpy.clear();
-            interactiveSpy.clear();
+            flickableSpy.clear();
             listView.interactive = true;
             listView.ViewItems.selectMode = false;
             listView.ViewItems.dragMode = false;
@@ -235,8 +235,8 @@
             mouseClick(defaults, 0, 0)
             movingSpy.target = null;
             movingSpy.clear();
-            interactiveSpy.target = null;
-            interactiveSpy.clear();
+            flickableSpy.target = null;
+            flickableSpy.clear();
             trailing.delegate = null;
             listView.positionViewAtBeginning();
             // keep additional timeout for proper cleanup
@@ -466,17 +466,15 @@
         }
         function test_listview_not_interactive_while_tugged(data) {
             listView.positionViewAtBeginning();
-            interactiveSpy.target = listView;
+            flickableSpy.target = listView;
             compare(listView.interactive, true, "ListView is not interactive");
-            interactiveSpy.target = listView;
             if (data.mouse) {
-                swipe(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
+                swipe(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
             } else {
-                tug(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
+                tug(data.item, data.pos.x, data.pos.y, data.dx, units.gu(5));
             }
             // animation should no longer be running!
-            compare(listView.interactive, true, "The ListView is still non-interactive!");
-            compare(interactiveSpy.count, 2, "Less/more times changed!");
+            compare(flickableSpy.count, 0, "Flickable moved!");
             // check if it snapped in
             verify(data.item.contentItem.x != 0.0, "Not snapped in!!");
             // dismiss
@@ -744,11 +742,12 @@
         function test_listitem_blocks_ascendant_flickables() {
             var listItem = findChild(nestedListView, "listItem0");
             verify(listItem, "Cannot find test item");
-            interactiveSpy.target = testFlickable;
+            flickableSpy.target = testFlickable;
             // tug leading
             swipe(listItem, centerOf(listItem).x, centerOf(listItem).y, listItem.width / 2, 0);
             // check if interactive got changed
-            interactiveSpy.wait();
+            expectFailContinue("", "Flickable should not move.");
+            flickableSpy.wait(200);
 
             // cleanup!!!
             rebound(listItem);
@@ -1200,7 +1199,7 @@
 
             var icon = findChild(testItem, data.action);
             verify(icon);
-            compare(icon.width, units.gu(5), "icon width should be the same no matter of the height set");
+            compare(icon.width, units.gu(6), "icon width should be the same no matter of the height set");
 
             rebound(testItem);
 

=== modified file 'tests/unit_x11/tst_components/tst_listitem_extras.qml'
--- tests/unit_x11/tst_components/tst_listitem_extras.qml	2015-09-02 10:55:46 +0000
+++ tests/unit_x11/tst_components/tst_listitem_extras.qml	2015-09-22 15:57:54 +0000
@@ -30,18 +30,18 @@
             Action {
                 iconName: "starred"
                 text: 'Bookmark'
-                objectName: "leading_1"
+                objectName: "trailing1"
             },
             Action {
                 iconName: "edit"
                 text: 'Edit'
-                objectName: "leading_2"
+                objectName: "trailing2"
                 onTriggered: text = 'Edit Again'
             },
             Action {
                 iconName: "camcorder"
                 text: 'Record'
-                objectName: "leading_3"
+                objectName: "trailing3"
             }
         ]
     }
@@ -50,7 +50,7 @@
         actions: Action {
             id: stockAction
             iconName: "torch-on"
-            objectName: "stockAction"
+            objectName: "leading1"
             text: 'Switch lights on'
         }
     }
@@ -80,6 +80,22 @@
                 onPressed: mouse.accepted = overlaidMouseArea.acceptEvent
             }
         }
+        ListView {
+            id: listView
+            width: parent.width
+            height: 4 * units.gu(7) // 4 items
+            clip: true
+            model: 5
+            delegate: ListItem {
+                objectName: "listItem" + index
+                Label {
+                    anchors.centerIn: parent
+                    text: index
+                }
+
+                leadingActions: leading
+            }
+        }
     }
 
     ListItemTestCase13 {
@@ -89,11 +105,16 @@
             signalName: "clicked"
         }
 
+        function initTestCase() {
+            TestExtras.registerTouchDevice();
+        }
+
         function cleanup() {
             rebound(testWithActiveItem);
             rebound(overlaidMouseArea);
             clickSpy.target = null;
             clickSpy.clear();
+            wait(200);
         }
 
         function test_swipe_over_active_item() {
@@ -114,5 +135,116 @@
             swipeNoWait(overlayArea, centerOf(overlayArea).x, centerOf(overlayArea).y, units.gu(10));
             spyWait();
         }
+
+        function test_swipe_out_from_overlay_button_bug1497156_data() {
+            return [
+                {tag: "leading with mouse", touch: false, swipeInDx: units.gu(20), swipeOutDx: -units.gu(5)},
+                {tag: "trailing with mouse", touch: false, swipeInDx: -units.gu(20), swipeOutDx: units.gu(5)},
+                {tag: "leading with touch", touch: true, swipeInDx: units.gu(20), swipeOutDx: -units.gu(5)},
+                {tag: "trailing with touch", touch: true, swipeInDx: -units.gu(20), swipeOutDx: units.gu(5)},
+            ]
+        }
+        function test_swipe_out_from_overlay_button_bug1497156(data) {
+            // swipe in and out from teh same point
+            if (data.touch) {
+                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.swipeInDx, 0);
+            } else {
+                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.swipeInDx, 0);
+            }
+            verify(testWithActiveItem.contentItem.x != 0, "Not swiped in");
+            // swipe out
+            if (data.touch) {
+                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.swipeOutDx, 0);
+            } else {
+                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.swipeOutDx, 0);
+            }
+            tryCompareFunction(function() {
+                return testWithActiveItem.contentItem.x == testWithActiveItem.contentItem.anchors.leftMargin;
+            }, true, 500);
+        }
+
+        function test_swipe_over_contextual_actions_bug1486008_data() {
+            return [
+                {tag: "leading action with mouse", touch: false, dx: units.gu(20), leadingPanel: true, action: "leading1"},
+                {tag: "trailing action with mouse", touch: false, dx: -units.gu(20), leadingPanel: false, action: "trailing1"},
+                {tag: "leading action with touch", touch: true, dx: units.gu(20), leadingPanel: true, action: "leading1"},
+                {tag: "trailing action with touch", touch: true, dx: -units.gu(20), leadingPanel: false, action: "trailing1"},
+            ];
+        }
+        function test_swipe_over_contextual_actions_bug1486008(data) {
+            if (data.touch) {
+                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+            } else {
+                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+            }
+            var panel = panelItem(testWithActiveItem, data.leadingPanel);
+            var actionItem = findChild(panel, data.action);
+            verify(actionItem, data.action + " action not found.");
+            // swipe over the action
+            setupSpy(testWithActiveItem, "contentMovementStarted");
+            if (data.touch) {
+                tugNoWait(actionItem, centerOf(actionItem).x, centerOf(actionItem).y, -data.dx, 0);
+            } else {
+                swipeNoWait(actionItem, centerOf(actionItem).x, centerOf(actionItem).y, -data.dx, 0);
+            }
+            expectFail(data.tag, "should not swipe");
+            spyWait();
+        }
+
+        function test_button_inactive_while_swiped_data() {
+            return [
+                {tag: "mouse", touch: false, dx: units.gu(20)},
+                {tag: "touch", touch: true, dx: units.gu(20)},
+            ];
+        }
+        function test_button_inactive_while_swiped(data) {
+            clickSpy.target = activeItem;
+            if (data.touch) {
+                tug(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+                TestExtras.touchClick(0, activeItem, centerOf(activeItem));
+            } else {
+                swipe(testWithActiveItem, centerOf(testWithActiveItem).x, centerOf(testWithActiveItem).y, data.dx, 0);
+                mouseClick(activeItem, centerOf(activeItem).x, centerOf(activeItem).y);
+            }
+            expectFail(data.tag, "Button is inactive while swiped");
+            clickSpy.wait(200);
+        }
+
+        function test_click_before_and_after_snapout_bug1496468_data() {
+            var item0 = findChild(listView, "listItem0");
+            var item1 = findChild(listView, "listItem1");
+            return [
+                {tag: "mouse", touch: false, clickedItem: item0, swipedItem: item1, dx: units.gu(20), reboundDx: -units.gu(5)},
+                {tag: "touch", touch: true, clickedItem: item0, swipedItem: item1, dx: units.gu(20), reboundDx: -units.gu(5)},
+            ];
+        }
+        function test_click_before_and_after_snapout_bug1496468(data) {
+            clickSpy.target = data.clickedItem;
+            if (data.touch) {
+                TestExtras.touchClick(0, data.clickedItem, centerOf(data.clickedItem));
+            } else {
+                mouseClick(data.clickedItem, centerOf(data.clickedItem).x, centerOf(data.clickedItem).y);
+            }
+            clickSpy.wait(200);
+            // swipe in then rebound
+            if (data.touch) {
+                tug(data.swipedItem, centerOf(data.swipedItem).x, centerOf(data.swipedItem).y, data.dx, 0);
+                wait(200);
+                tug(data.swipedItem, centerOf(data.swipedItem).x, centerOf(data.swipedItem).y, data.reboundDx, 0);
+            } else {
+                swipe(data.swipedItem, centerOf(data.swipedItem).x, centerOf(data.swipedItem).y, data.dx, 0);
+                wait(200);
+                swipe(data.swipedItem, centerOf(data.swipedItem).x, centerOf(data.swipedItem).y, data.reboundDx, 0);
+            }
+            // then test click
+            clickSpy.target = data.swipedItem;
+            clickSpy.clear();
+            if (data.touch) {
+                TestExtras.touchClick(0, data.swipedItem, centerOf(data.swipedItem));
+            } else {
+                mouseClick(data.swipedItem, centerOf(data.swipedItem).x, centerOf(data.swipedItem).y);
+            }
+            clickSpy.wait(200);
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_popover.qml'
--- tests/unit_x11/tst_components/tst_popover.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_popover.qml	2015-09-22 15:57:54 +0000
@@ -29,6 +29,11 @@
         y: main.height / 2
         height: units.gu(10)
         width: height
+        MouseArea {
+            id: whiteSpace
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        }
 
         Button {
             id: pressMe
@@ -68,6 +73,11 @@
         id: popoverSpy
         signalName: "hideCompleted"
     }
+    SignalSpy {
+        id: whiteSpy
+        signalName: "clicked"
+        target: whiteSpace
+    }
 
     Component {
         id: popoverComponent
@@ -116,6 +126,29 @@
             popoverSpy.wait();
         }
 
+        function test_popover_consumes_clicks_bug1488540_data() {
+            return [
+                { tag: 'Left-click', button: Qt.LeftButton },
+                { tag: 'Right-click', button: Qt.RightButton },
+                { tag: 'Middle-click', button: Qt.MiddleButton },
+            ]
+        }
+        function test_popover_consumes_clicks_bug1488540(data) {
+            mouseClick(pressMe, pressMe.width / 2, pressMe.height / 2);
+            waitForRendering(pressMe);
+            verify(popoverSpy.target !== null, "The popover did not open");
+            var popover = popoverSpy.target;
+            // Click in the popover, the rectangle doesn't handle clicks
+            whiteSpy.clear();
+            mouseClick(popover, popover.width / 2, popover.height / 2, data.button);
+            // dismiss
+            mouseClick(main, 10, 10, Qt.LeftButton);
+            popoverSpy.wait();
+            // Did the click reach through the popover foreground?
+            compare(whiteSpy.count, 0, 'Click passed through popover foreground!');
+
+        }
+
         function test_popover_follows_pointerTarget_bug1199502_data() {
             return [
                 { tag: "Moving pointerTarget", button: pressMe, dir: "down", y: 318 },

=== added file 'tests/unit_x11/tst_components/tst_popover13.qml'
--- tests/unit_x11/tst_components/tst_popover13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_popover13.qml	2015-09-22 15:57:54 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2014-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+MainView {
+    id: main
+    width: units.gu(50)
+    height: units.gu(71)
+
+    Rectangle {
+        id: rect
+        y: main.height / 2
+        height: units.gu(10)
+        width: height
+        MouseArea {
+            id: whiteSpace
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        }
+
+        Button {
+            id: pressMe
+            anchors.top: parent.top
+            text: "Press me"
+            onClicked: {
+                testCase.resetPositions();
+                var popover = PopupUtils.open(popoverComponent, pressMe);
+                popoverSpy.target = testCase.findChild(popover, "popover_foreground");
+                popoverSpy.clear();
+                pressMe.parent.height = units.gu(25)
+                pressMe.anchors.top = parent.bottom
+            }
+        }
+
+        Button {
+            id: pushMe
+            anchors.bottom: parent.bottom
+            text: "Push me"
+            onClicked: {
+                testCase.resetPositions();
+                var popover = PopupUtils.open(popoverComponent, pushMe);
+                popoverSpy.target = testCase.findChild(popover, "popover_foreground");
+                popoverSpy.clear();
+                rect.y = main.height / 10
+            }
+        }
+    }
+    Label {
+        id: other
+        text: "Ignore me"
+        anchors.centerIn: parent
+    }
+
+    // spy to listen on the popover foreground's hideCompleted() signal
+    SignalSpy {
+        id: popoverSpy
+        signalName: "hideCompleted"
+    }
+    SignalSpy {
+        id: whiteSpy
+        signalName: "clicked"
+        target: whiteSpace
+    }
+
+    Component {
+        id: popoverComponent
+        Popover {
+            objectName: "popover"
+            Rectangle {
+                width: units.gu(20)
+                height: units.gu(20)
+                color: "blue"
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        id: testCase
+        name: "PopoverTests"
+        when: windowShown
+
+        function resetPositions() {
+            pressMe.parent.height = units.gu(10)
+            rect.y = main.height / 2
+        }
+
+        function cleanup() {
+            resetPositions()
+            popoverSpy.target = null;
+            popoverSpy.clear();
+            waitForRendering(main, 500);
+        }
+
+        function test_dismiss_on_click_data() {
+            return [
+                        {button: Qt.LeftButton},
+                        {button: Qt.MiddleButton},
+                        {button: Qt.RightButton},
+                    ];
+        }
+
+        function test_dismiss_on_click(data) {
+            mouseClick(pressMe, pressMe.width / 2, pressMe.height / 2);
+            waitForRendering(pressMe);
+            verify(popoverSpy.target !== null, "The popover did not open");
+
+            // dismiss
+            mouseClick(main, 10, 10, data.button);
+            popoverSpy.wait();
+        }
+
+        function test_popover_consumes_clicks_bug1488540_data() {
+            return [
+                { tag: 'Left-click', button: Qt.LeftButton },
+                { tag: 'Right-click', button: Qt.RightButton },
+                { tag: 'Middle-click', button: Qt.MiddleButton },
+            ]
+        }
+        function test_popover_consumes_clicks_bug1488540(data) {
+            mouseClick(pressMe, pressMe.width / 2, pressMe.height / 2);
+            waitForRendering(pressMe);
+            verify(popoverSpy.target !== null, "The popover did not open");
+            var popover = popoverSpy.target;
+            // Click in the popover, the rectangle doesn't handle clicks
+            whiteSpy.clear();
+            mouseClick(popover, popover.width / 2, popover.height / 2, data.button);
+            // dismiss
+            mouseClick(main, 10, 10, Qt.LeftButton);
+            popoverSpy.wait();
+            // Did the click reach through the popover foreground?
+            compare(whiteSpy.count, 0, 'Click passed through popover foreground!');
+
+        }
+
+        function test_popover_follows_pointerTarget_bug1199502_data() {
+            return [
+                { tag: "Moving pointerTarget", button: pressMe, dir: "down", y: 318 },
+                // FIXME: { tag: "Moving parent", button: pushMe, dir: "up", y: 142.8 },
+                // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1427557
+            ]
+        }
+        function test_popover_follows_pointerTarget_bug1199502(data) {
+            mouseClick(data.button, data.button.width / 2, data.button.height / 2);
+            waitForRendering(data.button);
+            var dir = popoverSpy.target.direction
+            var popoverY = popoverSpy.target.y
+
+            // dismiss
+            mouseClick(main, 10, 10, Qt.LeftButton);
+            popoverSpy.wait();
+
+            // ensure popover was next to caller
+            compare(dir, data.dir, "Popover arrow is wrong")
+            compare(popoverY, data.y, "Popover isn't pointing at the caller")
+        }
+    }
+}

=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2015-08-13 09:20:05 +0000
+++ ubuntu-sdk.pro	2015-09-22 15:57:54 +0000
@@ -8,7 +8,7 @@
 requires(qtHaveModule(quick))
 load(qt_parts)
 
-SUBDIRS += po documentation
+SUBDIRS += po documentation ubuntu-ui-toolkit-launcher
 
 #when standalone we always want tests to be built
 !build_with_qt{

=== renamed directory 'tests/launcher' => 'ubuntu-ui-toolkit-launcher'
=== renamed file 'tests/launcher/launcher.pro' => 'ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro'
--- tests/launcher/launcher.pro	2014-06-17 07:12:49 +0000
+++ ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2015-09-22 15:57:54 +0000
@@ -6,8 +6,8 @@
 HEADERS += MouseTouchAdaptor.h
 SOURCES += launcher.cpp \
     MouseTouchAdaptor.cpp
-installPath = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit
+installPath = $$[QT_INSTALL_PREFIX]/bin
 launcher.path = $$installPath
-launcher.files = launcher
+launcher.files = ubuntu-ui-toolkit-launcher
 INSTALLS += launcher