Merge lp:~uriboni/webbrowser-app/tabs-use-haptics into lp:webbrowser-app

[Ugo Riboni]

Use AbstractButton to handle some tab interactions so that haptics are used on touch.

Use AbstractButton to handle some tab interactions on mobile so that haptics are triggered

[lp:~uriboni/webbrowser-app/tabs-use-haptics]

1257. By Ugo Riboni on 2015-10-26

Handle close tab interactions via AbstractButtons instead of MouseArea so they trigger haptics on mobile

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1257
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2402/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1156
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4825
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4825/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24569

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2402/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1257
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2404/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1158
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3899
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4839
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4839/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24592

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2404/rebuild

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/TabItem.qml'
--- src/app/webbrowser/TabItem.qml	2015-09-29 09:31:50 +0000
+++ src/app/webbrowser/TabItem.qml	2015-10-26 15:34:34 +0000
@@ -114,12 +114,10 @@
             }
         }
 
-        MouseArea {
+        AbstractButton {
             id: closeButton
             objectName: "closeButton"
 
-            acceptedButtons: Qt.LeftButton | Qt.MiddleButton
-
             // On mobile the tap area to close the tab occupies the whole right
             // hand side of the tab, while it covers only the close icon in
             // other form factors
@@ -131,6 +129,12 @@
             width: mobile ? units.gu(4) : closeIcon.width
 
             onClicked: closed()
+
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.MiddleButton
+                onClicked: closed()
+            }
         }
 
         Icon {