TableView: correct event.accepted in key handlers

Autotest is included.

Task-number: QTBUG-41444
Change-Id: Ia3120b62a58361fbb13cd06e9c17b0e511cecace
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

2 files changed, 124 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tableview/tv_keys_2.qml b/tests/auto/controls/data/tableview/tv_keys_2.qml
new file mode 100644
index 00000000..06eba0ef
--- /dev/null
+++ b/tests/auto/controls/data/tableview/tv_keys_2.qml
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+
+Row {
+    width: 100
+    height: 200
+    spacing: 10
+    property alias control1: _control1
+    ListModel {
+        id: libraryModel
+        ListElement{ title: "A Masterpiece" ; author: "Gabriel" }
+        ListElement{ title: "Brilliance"    ; author: "Jens" }
+        ListElement{ title: "Outstanding"   ; author: "Frederik" }
+    }
+
+    FocusScope {
+        focus: true
+        id: _control1
+        property alias control2: _control2
+        property bool gotit: false
+        TableView {
+            id: _control2
+            TableViewColumn{ role: "title"  ; title: "Title" ; width: 100 }
+            TableViewColumn{ role: "author" ; title: "Author" ; width: 200 }
+            model: libraryModel
+        }
+        Keys.onPressed: {
+            if ((!gotit) && (event.key === Qt.Key_Up || event.key === Qt.Key_Down)) {
+                gotit = true;
+                event.accepted = true;
+                return;
+            }
+        }
+    }
+}
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index 9e37f45e..71f92a3f 100644
--- a/tests/auto/controls/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -210,6 +210,55 @@ TestCase {
         test.destroy()
     }
 
+    function test_keys_2() {
+        var component = Qt.createComponent("tableview/tv_keys_2.qml")
+        compare(component.status, Component.Ready)
+        var test =  component.createObject(container);
+        verify(test !== null, "test control created is null")
+        var control1 = test.control1
+        verify(control1 !== null)
+        var control2 = control1.control2
+        verify(control2 !== null)
+
+        control2.forceActiveFocus()
+        verify(control2.activeFocus)
+
+        control2.currentRow = 1
+        control2.selection.select(1, 1)
+
+        verify(control1.gotit === false)
+        verify(control2.currentRow === 1)
+
+        keyClick(Qt.Key_Up);
+        verify(control1.activeFocus)
+        verify(control1.gotit === false)
+        verify(control2.currentRow === 0)
+
+        keyClick(Qt.Key_Up);
+        verify(control1.activeFocus)
+        verify(control1.gotit === true)
+        verify(control2.currentRow === 0)
+
+        control2.currentRow = 1
+        control2.selection.select(1, 1)
+        control1.gotit = false
+
+        verify(control1.gotit === false)
+        verify(control2.currentRow === 1)
+
+        keyClick(Qt.Key_Down);
+        verify(control1.activeFocus)
+        verify(control1.gotit === false)
+        verify(control2.currentRow === 2)
+
+        keyClick(Qt.Key_Down);
+        verify(control1.activeFocus)
+        verify(control1.gotit === true)
+        verify(control2.currentRow === 2)
+
+        test.destroy()
+    }
+
     function test_selection() {
 
         var component = Qt.createComponent("tableview/table2_qabstractitemmodel.qml")