Merge lp:~zsombi/ubuntu-ui-toolkit/cppAbstractButton into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

AbstractButton to C++.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1622
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2146/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/874
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/876
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/876/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/873

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1625
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/879
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/879/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/876

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1626
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/880
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/880/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/877

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1627
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/884
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/884/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/881

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1628
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/886
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/883

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Why are you not importing the latest versions (not only of Ubuntu.Components, but also QtQuick and Ambience) in the performance tests?

686 === added file 'tests/unit/tst_performance/AbstractButtonGrid.qml'
706 +import QtQuick 2.0
707 +import Ubuntu.Components 1.1
708 +import Ubuntu.Components.Themes.Ambiance 0.1

722 === modified file 'tests/unit/tst_performance/ButtonGrid.qml'
728 import QtQuick 2.0
729 -import Ubuntu.Components 1.1
730 +import Ubuntu.Components 1.3
731 import Ubuntu.Components.Themes.Ambiance 0.1

[Tim Peeters (tpeeters)]

883 + // fixing bugs 1365471 and 1458028
884 + function test_no_pressAndHold_connected_clicks() {

890 + // fixing bugs 1365471 and 1458028
891 + function test_pressAndHold_connected_suppresses_clicks() {

We have the policy to add _bugXXX to the function names. Let's do that here too because when a test starts to fail like that we can look up the bug immediately without going into the test code first.

review: Needs Fixing

[Tim Peeters (tpeeters)]

351 === modified file 'src/Ubuntu/Components/ListItems/1.2/SingleControl.qml'
360 + /*! \internal - overriding readonly pressed property due to the buggy pressed property exposure in former AbstractButton */
361 + property bool pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)

I think we should override the property in Empty.qml instead to avoid problems in apps that have their own components deriving from Empty.

[Tim Peeters (tpeeters)]

^maybe for 'hovered' too, to be sure.

[Zsombor Egri (zsombi)]

> Why are you not importing the latest versions (not only of Ubuntu.Components,
> but also QtQuick and Ambience) in the performance tests?
>
> 686 === added file 'tests/unit/tst_performance/AbstractButtonGrid.qml'
> 706 +import QtQuick 2.0
> 707 +import Ubuntu.Components 1.1
> 708 +import Ubuntu.Components.Themes.Ambiance 0.1

Copy-paste bug :)
>
> 722 === modified file 'tests/unit/tst_performance/ButtonGrid.qml'
> 728 import QtQuick 2.0
> 729 -import Ubuntu.Components 1.1
> 730 +import Ubuntu.Components 1.3
> 731 import Ubuntu.Components.Themes.Ambiance 0.1

This is the same reason we must get rid of the deprecation warnings... I'll roll this back

[Zsombor Egri (zsombi)]

> 351 === modified file
> 'src/Ubuntu/Components/ListItems/1.2/SingleControl.qml'
> 360 + /*! \internal - overriding readonly pressed property due to the
> buggy pressed property exposure in former AbstractButton */
> 361 + property bool pressed: __mouseArea.pressed || (control &&
> control.hasOwnProperty("pressed") && control.pressed)
>
>
> I think we should override the property in Empty.qml instead to avoid problems
> in apps that have their own components deriving from Empty.

Well, the property was there in SingleControl, so why would I move that to Empty?Beside, this should not happen according to the new design, so when you tap on a widget, that should not highlight the component.

[Tim Peeters (tpeeters)]

> > 351 === modified file
> > 'src/Ubuntu/Components/ListItems/1.2/SingleControl.qml'
> > 360 + /*! \internal - overriding readonly pressed property due to the
> > buggy pressed property exposure in former AbstractButton */
> > 361 + property bool pressed: __mouseArea.pressed || (control &&
> > control.hasOwnProperty("pressed") && control.pressed)
> >
> >
> > I think we should override the property in Empty.qml instead to avoid
> problems
> > in apps that have their own components deriving from Empty.
>
> Well, the property was there in SingleControl, so why would I move that to
> Empty?Beside, this should not happen according to the new design, so when you
> tap on a widget, that should not highlight the component.

Like SingleControl, custom list items may set the value of pressed. Making it read-only will break those custom list items. Of course we cannot be sure that this is (still) happening without checking the code of the apps.

[Tim Peeters (tpeeters)]

Because it is cpp, the change will affect also 0.1-1.2... so it is dangerous.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1630
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/896
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/893

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Okay, looks good now.

Note that in all import versions we change the RW properties hovered and pressed to read-only. That makes sense (overriding the values of the properties would break the button's functionality), but before it lands we make sure that no apps are setting the properties.

Happroving.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1632
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2168/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/898/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/895/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1059/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/366/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1632
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2169/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/896/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/cppAbstractButton]

1633. By Zsombor Egri on 2015-08-24

roll back AbstractButton for versions earlier than 1.3 to avoid API break

[Cris Dywan (kalikiana)]

Leaving the 1.2 at QML is a good idea that I didn't consider an option. That way we're safe in terms of compatibility. Nice!
Let's see that the tests agree, too.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1633
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2170/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/898/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/900/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/897/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/cppAbstractButton]

1634. By Zsombor Egri on 2015-08-24

documentation fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1634
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2171/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/901
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/901/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/898

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

there are some failures:

Test Result (2 failures / ±0)
components.AbstractButtonAPI::test_no_pressAndHold_connected_clicks_bug1365471_bug1458028
components.ListItemsEmptyAPI::test_hovered

[lp:~zsombi/ubuntu-ui-toolkit/cppAbstractButton]

1635. By Zsombor Egri on 2015-08-25

reverting unit test move for API 1.2

1636. By Zsombor Egri on 2015-08-25

separate 1.3 tests from earlier versions; add 1.3 performance tests

1637. By Zsombor Egri on 2015-08-25

overridden trigger() function support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/903
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/905
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/905/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/902

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

222 === modified file 'src/Ubuntu/Components/ListItems/1.2/Empty.qml'
223 --- src/Ubuntu/Components/ListItems/1.2/Empty.qml 2015-04-30 08:32:44 +0000
224 +++ src/Ubuntu/Components/ListItems/1.2/Empty.qml 2015-08-25 11:31:46 +0000
225 @@ -158,6 +158,10 @@
226 */
227 property real __contentsMargins: units.gu(2)
228
229 + // override pressed and hovered as those were declared writable
230 + property bool pressed: __mouseArea.pressed
231 + property bool hovered: __acceptEvents && __mouseArea.containsMouse
232 +

do we still need this? 1.2 now has the old AbstractButton where those properties are already writable.

[lp:~zsombi/ubuntu-ui-toolkit/cppAbstractButton]

1638. By Zsombor Egri on 2015-08-25

revert unneeded 1.2 changes

[Cris Dywan (kalikiana)]

Nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1638
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/906
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/906/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/903

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-08-20 08:10:44 +0000
+++ components.api	2015-08-25 13:10:33 +0000
@@ -4,10 +4,10 @@
     signal pressAndHold()
     property bool pressed
 Ubuntu.Components.AbstractButton 1.3: ActionItem
-    property bool hovered
+    readonly property bool hovered
     signal clicked()
     signal pressAndHold()
-    property bool pressed
+    readonly property bool pressed
 Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
     property string description
     property bool enabled

=== removed file 'src/Ubuntu/Components/1.3/AbstractButton.qml'
--- src/Ubuntu/Components/1.3/AbstractButton.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/AbstractButton.qml	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright 2012 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
-
-/*!
-    \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief The AbstractButton class defines the behavior of the button.
-
-    This class defines the behavior of the button: it defines the MouseArea
-    and the states.
-    All components deriving from this class support haptic feedback out of the box.
-*/
-ActionItem {
-    id: button
-
-    /*!
-      If an action is specified, the button's clicked signal will trigger the action.
-      Subclasses of AbstractButton can use other properties of action (for example
-      the text and iconName).
-      \qmlproperty Action action
-     */
-
-    /*!
-       This handler is called when there is a mouse click on the button
-       and the button is not disabled. If \b action is defined,
-       the action will be triggered.
-    */
-    signal clicked()
-
-    /*!
-      If a button is clicked, its triggered() signal will automatically be called.
-     */
-    onClicked: button.trigger()
-
-    Keys.onEnterPressed: clicked()
-    Keys.onReturnPressed: clicked()
-
-    /*!
-      This handler is called when there is a long press.
-     */
-    signal pressAndHold()
-
-    /*!
-      True if the user presses a mouse button in the button's mouse area.
-     */
-    property bool pressed: mouseArea.pressed
-
-    /*!
-      True if the mouse cursor hovers over the button's mouse area.
-     */
-    property bool hovered: __acceptEvents && mouseArea.containsMouse
-
-    /*!
-      \internal
-      Disable or enable signal emition by default.
-      Some classes want to emit the signal by themselves (ListItem.Standard)
-     */
-    property bool __acceptEvents: true
-
-    /*!
-      \internal
-      To get the properties of the mouse area in subclasses.
-     */
-    property alias __mouseArea: mouseArea
-
-    activeFocusOnPress: true
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        // if mouseArea is given a new value, disable defaultMouseArea
-        // as it might occlude the newly assigned mouse area.
-        hoverEnabled: true
-
-        // invoke Haptics singleton earlier than we press the button,
-        // so we give some time for the singleton to sync settings with the service
-        property bool hapticsEnabled: Haptics.enabled
-
-        onClicked: {
-            if (button.__acceptEvents) {
-                // FIXME (Vivid) call this in the style rather than from AbstractButton
-                Haptics.play();
-                button.clicked()
-            }
-        }
-        onPressAndHold: {
-            if (button.__acceptEvents) {
-                button.pressAndHold()
-            }
-        }
-    }
-}

=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-05-26 15:05:46 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	2015-08-25 13:10:33 +0000
@@ -105,7 +105,7 @@
     /*!
       The font used for the button's text.
     */
-    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
+    property font font: __styleInstance.defaultFont
 
     /*!
        The position of the icon relative to the text. Options

=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2015-08-25 13:10:33 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 
 /*!

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-08-18 15:51:43 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-08-25 13:10:33 +0000
@@ -896,7 +896,7 @@
         }
     }
 
-    AbstractButton {
+    Ubuntu.AbstractButton {
         id: clearButton
         objectName: "clear_button"
         activeFocusOnPress: false

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-08-19 08:57:18 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-08-25 13:10:33 +0000
@@ -80,8 +80,7 @@
              1.2/UbuntuNumberAnimation.qml
 
 #1.3
-QML_FILES += 1.3/AbstractButton.qml \
-             1.3/ActionBar.qml \
+QML_FILES += 1.3/ActionBar.qml \
              1.3/ActionList.qml \
              1.3/ActivityIndicator.qml \
 	     1.3/AdaptivePageLayout.qml \

=== modified file 'src/Ubuntu/Components/ListItems/1.3/SingleControl.qml'
--- src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-08-25 13:10:33 +0000
@@ -54,7 +54,8 @@
 
     /*! \internal */
     onClicked: if (control && control.enabled && control.hasOwnProperty("clicked")) control.clicked()
-    pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
+    /*! \internal */
+    property bool pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
     /*! \internal */
     onPressedChanged: if (control && control.enabled && control.hasOwnProperty("pressed")) control.pressed = singleControlListItem.pressed
 

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-08-19 08:44:45 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-08-25 13:10:33 +0000
@@ -64,6 +64,7 @@
 #include "ucnamespace.h"
 #include "ucactionitem.h"
 #include "uchaptics.h"
+#include "ucabstractbutton.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -232,6 +233,7 @@
     qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
     qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
     qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
+    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-08-20 11:35:51 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-08-25 13:10:33 +0000
@@ -82,7 +82,8 @@
     $$PWD/livetimer_p.h \
     $$PWD/timeutils_p.h \
     $$PWD/ucactionitem.h \
-    $$PWD/uchaptics.h
+    $$PWD/uchaptics.h \
+    $$PWD/ucabstractbutton.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -136,7 +137,8 @@
     $$PWD/livetimer.cpp \
     $$PWD/livetimer_p.cpp \
     $$PWD/ucactionitem.cpp \
-    $$PWD/uchaptics.cpp
+    $$PWD/uchaptics.cpp \
+    $$PWD/ucabstractbutton.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp

=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-08-25 13:10:33 +0000
@@ -0,0 +1,156 @@
+/*
+ * 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/>.
+ */
+
+#include "ucabstractbutton.h"
+#include "uchaptics.h"
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickmousearea_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
+
+/*!
+    \qmltype AbstractButton
+    \instantiates UCAbstractButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief The AbstractButton class defines the behavior of the button.
+
+    This class defines the behavior of the button. All components deriving from
+    this class support haptic feedback out of the box.
+
+    If an action is specified, the button's clicked signal will trigger the action.
+    Subclasses of AbstractButton can use other properties of action (for example
+    the text and iconName).
+*/
+
+/*!
+ *
+ * \qmlsignal AbstractButton::clicked()
+ * This handler is called when there is a mouse click on the button and the button
+ * is not disabled. If \l {ActionItem::action}{action} is defined, the action will be triggered.
+ */
+
+/*!
+ *
+ * \qmlsignal AbstractButton::pressAndHold()
+ * This handler is called when there is a long press.
+ */
+
+UCAbstractButton::UCAbstractButton(QQuickItem *parent)
+    : UCActionItem(parent)
+    , m_mouseArea(new QQuickMouseArea)
+    , m_acceptEvents(true)
+{
+    setActiveFocusOnPress(true);
+}
+
+bool UCAbstractButton::isPressAndHoldConnected()
+{
+    static QMetaMethod method = QMetaMethod::fromSignal(&UCAbstractButton::pressAndHold);
+    static int signalIdx = QMetaObjectPrivate::signalIndex(method);
+    return QObjectPrivate::get(this)->isSignalConnected(signalIdx);
+}
+
+void UCAbstractButton::classBegin()
+{
+    UCActionItem::classBegin();
+
+    // make sure we have the haptics set up!
+    HapticsProxy::instance().initialize();
+
+    // set up mouse area
+    QQml_setParent_noEvent(m_mouseArea, this);
+    m_mouseArea->setParentItem(this);
+    QQuickAnchors *anchors = QQuickItemPrivate::get(m_mouseArea)->anchors();
+    anchors->setFill(this);
+    m_mouseArea->setHoverEnabled(true);
+}
+
+void UCAbstractButton::componentComplete()
+{
+    UCActionItem::componentComplete();
+    // connect to the right slot, using macros so we get the proper slot
+    connect(this, SIGNAL(clicked()), this, SLOT(trigger()));
+
+    // bind mouse area
+    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
+    connect(m_mouseArea, &QQuickMouseArea::hoveredChanged, this, &UCAbstractButton::hoveredChanged);
+    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaClicked()));
+    if (isPressAndHoldConnected()) {
+        connect(m_mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaPressAndHold()));
+    }
+}
+
+// handle mouseClicked with Haptics
+void UCAbstractButton::_q_mouseAreaClicked()
+{
+    // required by the deprecated ListItem module
+    if (!m_acceptEvents) {
+        return;
+    }
+    // play haptics
+    HapticsProxy::instance().play(QVariant());
+    Q_EMIT clicked();
+}
+
+// handle pressAndHold
+void UCAbstractButton::_q_mouseAreaPressAndHold()
+{
+    // required by the deprecated ListItem module
+    if (!m_acceptEvents) {
+        return;
+    }
+    Q_EMIT pressAndHold();
+}
+
+// emit clicked when Enter/Return is pressed
+void UCAbstractButton::keyPressEvent(QKeyEvent *event)
+{
+    UCActionItem::keyPressEvent(event);
+
+    switch (event->key()) {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+        // FIXME: space may also come here, however that depends on the button type
+        // (i.e default Dialog btn) so we may need to add that to Button
+        {
+            Q_EMIT clicked();
+            break;
+        }
+    }
+}
+
+/*!
+ * \qmlproperty bool AbstractButton::pressed
+ * True if the user presses a mouse button in the button's mouse area.
+ */
+bool UCAbstractButton::pressed() const
+{
+    return m_mouseArea ? m_mouseArea->pressed() : false;
+}
+
+/*!
+ * \qmlproperty bool AbstractButton::hovered
+ * True if the mouse cursor hovers over the button's mouse area.
+ */
+bool UCAbstractButton::hovered() const
+{
+    return m_mouseArea ? m_mouseArea->hovered() : false;
+}
+
+QQuickMouseArea *UCAbstractButton::privateMouseArea() const
+{
+    return m_mouseArea;
+}

=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-08-25 13:10:33 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UCABSTRACTBUTTON_H
+#define UCABSTRACTBUTTON_H
+
+#include "ucactionitem.h"
+
+class QQuickMouseArea;
+class UCAbstractButton : public UCActionItem
+{
+    Q_OBJECT
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
+    Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
+
+    // internal, declared to support the deprecated ListItem module
+    Q_PROPERTY(bool __acceptEvents MEMBER m_acceptEvents)
+    Q_PROPERTY(QQuickMouseArea *__mouseArea READ privateMouseArea CONSTANT)
+public:
+    explicit UCAbstractButton(QQuickItem *parent = 0);
+
+    bool pressed() const;
+    bool hovered() const;
+
+    bool privateAcceptEvents() const;
+    void setPrivateAcceptEvents(bool accept);
+    QQuickMouseArea *privateMouseArea() const;
+
+protected:
+    void classBegin();
+    void componentComplete();
+    void keyPressEvent(QKeyEvent *key);
+
+Q_SIGNALS:
+    void pressedChanged();
+    void hoveredChanged();
+    void clicked();
+    void pressAndHold();
+
+protected Q_SLOTS:
+    void _q_mouseAreaClicked();
+    void _q_mouseAreaPressAndHold();
+
+protected:
+    QQuickMouseArea *m_mouseArea;
+    bool m_acceptEvents:1;
+
+    bool isPressAndHoldConnected();
+};
+
+#endif // UCABSTRACTBUTTON_H

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-08-18 15:51:43 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2015-08-25 13:10:33 +0000
@@ -301,7 +301,8 @@
         return false;
     }
 
-    trigger();
+    // do not call trigger() directly but invoke, as it may get overridden in QML
+    metaObject()->invokeMethod(this, "trigger");
     return true;
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-19 06:56:56 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-25 13:10:33 +0000
@@ -44,6 +44,17 @@
     connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
 }
 
+void UCActionItem::componentComplete()
+{
+    UCStyledItemBase::componentComplete();
+    // make sure we connect to the right signals, so we detach and re-attach actions
+    // to make sure the SLOT macro picks up the custom trigger() slot
+    if (m_action) {
+        attachAction(false);
+        attachAction(true);
+    }
+}
+
 void UCActionItem::_q_visibleChanged()
 {
     m_flags |= CustomVisible;
@@ -96,8 +107,8 @@
 void UCActionItem::attachAction(bool attach)
 {
     if (attach) {
-        connect(this, &UCActionItem::triggered,
-                m_action, &UCAction::triggered, Qt::DirectConnection);
+        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,
@@ -115,8 +126,8 @@
                     this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
         }
     } else {
-        disconnect(this, &UCActionItem::triggered,
-                   m_action, &UCAction::triggered);
+        disconnect(this, SIGNAL(triggered(QVariant)),
+                   m_action, SLOT(trigger(QVariant)));
         disconnect(m_action, &UCAction::visibleChanged,
                    this, &UCActionItem::_q_updateVisible);
         disconnect(m_action, &UCAction::enabledChanged,

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.h'
--- src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-19 06:55:11 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-25 13:10:33 +0000
@@ -70,6 +70,8 @@
     UCAction *m_action;
     quint8 m_flags;
 
+    void componentComplete();
+
     void updateProperties();
     void attachAction(bool attach);
 };

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-08-19 08:44:45 +0000
+++ src/Ubuntu/Components/qmldir	2015-08-25 13:10:33 +0000
@@ -115,7 +115,6 @@
 TabBar 1.3 1.3/TabBar.qml
 Tabs 1.3 1.3/Tabs.qml
 Label 1.3 1.3/Label.qml
-AbstractButton 1.3 1.3/AbstractButton.qml
 ActivityIndicator 1.3 1.3/ActivityIndicator.qml
 ProgressBar 1.3 1.3/ProgressBar.qml
 TextField 1.3 1.3/TextField.qml

=== modified file 'tests/unit/tst_components/tst_action.qml'
--- tests/unit/tst_components/tst_action.qml	2015-07-09 17:55:03 +0000
+++ tests/unit/tst_components/tst_action.qml	2015-08-25 13:10:33 +0000
@@ -34,6 +34,11 @@
          return false;
      }
 
+     function cleanup() {
+         triggeredSignalSpy.target = action;
+         triggeredSignalSpy.clear();
+     }
+
      function initTestCase() {
          compare(action.text, "", "text is empty string set by default")
          compare(action.iconSource, "", "iconSource is empty string by default")
@@ -132,6 +137,12 @@
          verify(!data.inactive.active, "Context deactivation error");
      }
 
+     function test_overloaded_action_trigger() {
+         triggeredSignalSpy.target = suppressTrigger;
+         suppressTrigger.trigger();
+         compare(triggeredSignalSpy.count, 0, "Overloaded trigger should not trigger action");
+     }
+
      Action {
          id: action
      }
@@ -185,4 +196,9 @@
          id: context2
      }
 
+     Action {
+         id: suppressTrigger
+         function trigger() {}
+     }
+
 }

=== added file 'tests/unit/tst_performance/AbstractButton13Grid.qml'
--- tests/unit/tst_performance/AbstractButton13Grid.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/AbstractButton13Grid.qml	2015-08-25 13:10:33 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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.0
+import Ubuntu.Components 1.3
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 16
+    Repeater {
+        model: 16*16
+        AbstractButton {
+        }
+    }
+}

=== added file 'tests/unit/tst_performance/AbstractButtonGrid.qml'
--- tests/unit/tst_performance/AbstractButtonGrid.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/AbstractButtonGrid.qml	2015-08-25 13:10:33 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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.0
+import Ubuntu.Components 1.1
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 16
+    Repeater {
+        model: 16*16
+        AbstractButton {
+        }
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-04-14 07:41:52 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-08-25 13:10:33 +0000
@@ -102,6 +102,8 @@
         QTest::addColumn<QString>("document");
         QTest::addColumn<QUrl>("theme");
 
+        QTest::newRow("AbstractButton 1.2") << "AbstractButtonGrid.qml" << QUrl();
+        QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
         QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
         QTest::newRow("grid with Text") << "TextGrid.qml" << QUrl();
         QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();

=== modified file 'tests/unit/tst_performance/tst_performance.pro'
--- tests/unit/tst_performance/tst_performance.pro	2015-04-01 08:33:53 +0000
+++ tests/unit/tst_performance/tst_performance.pro	2015-08-25 13:10:33 +0000
@@ -30,4 +30,6 @@
     Styling.qml \
     PaletteConfigurationOneColor.qml \
     PaletteConfigurationAllColors.qml \
-    StyledItemNewTheming.qml
+    StyledItemNewTheming.qml \
+    AbstractButtonGrid.qml \
+    AbstractButton13Grid.qml

=== added file 'tests/unit_x11/tst_components/tst_abstractbutton13.qml'
--- tests/unit_x11/tst_components/tst_abstractbutton13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-08-25 13:10:33 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2012 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
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        AbstractButton {
+            id: absButton
+            width: units.gu(10)
+            height: units.gu(10)
+        }
+        AbstractButton {
+            id: absLongTap
+            width: units.gu(10)
+            height: width
+            onPressAndHold: {}
+        }
+        AbstractButton {
+            id: suppressTrigger
+            width: units.gu(10)
+            height: width
+            function trigger() {}
+        }
+    }
+
+    Action {
+        id: action1
+        property int triggerCount: 0
+        onTriggered: triggerCount++
+    }
+
+    SignalSpy {
+        id: signalSpy
+        target: absButton
+        signalName: "clicked"
+    }
+
+    SignalSpy {
+        id: pressAndHoldSpy
+        target: absLongTap
+        signalName: "pressAndHold"
+    }
+
+    SignalSpy {
+        id: triggeredSpy
+        signalName: "triggered"
+    }
+
+    UbuntuTestCase {
+        name: "AbstractButtonAPI"
+        when: windowShown
+
+        function cleanup() {
+            signalSpy.clear();
+            triggeredSpy.clear();
+        }
+
+        function test_action() {
+            compare(absButton.action, null,"Action is null by default")
+            absButton.action = action1
+            compare(absButton.action, action1, "Action can be set")
+            var numTriggers = action1.triggerCount
+            absButton.clicked()
+            compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
+            absButton.action = null
+        }
+
+        function test_custom_trigger_function() {
+            suppressTrigger.action = action1;
+            triggeredSpy.target = action1;
+            mouseClick(suppressTrigger, centerOf(suppressTrigger).x, centerOf(suppressTrigger).y);
+            compare(triggeredSpy.count, 0, "Trigger should be overridden");
+        }
+
+        // fixing bugs 1365471 and 1458028
+        function test_no_pressAndHold_connected_clicks_bug1365471_bug1458028() {
+            signalSpy.target = absButton;
+            mouseLongPress(absButton, centerOf(absButton).x, centerOf(absButton).y);
+            mouseRelease(absButton, centerOf(absButton).x, centerOf(absButton).y);
+            signalSpy.wait();
+        }
+
+        // fixing bugs 1365471 and 1458028
+        function test_pressAndHold_connected_suppresses_clicks_bug1365471_bug1458028() {
+            function testFunc() {}
+            signalSpy.target = absButton;
+            absLongTap.pressAndHold.connect(testFunc);
+            mouseLongPress(absLongTap, centerOf(absLongTap).x, centerOf(absLongTap).y);
+            absLongTap.pressAndHold.disconnect(testFunc);
+            pressAndHoldSpy.wait();
+            mouseRelease(absLongTap, centerOf(absLongTap).x, centerOf(absLongTap).y);
+            compare(signalSpy.count, 0, "click() must be suppressed when pressAndHold handler is implemented");
+        }
+    }
+}