diff options
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 1226 | ||||
-rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 13 | ||||
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 28 | ||||
-rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 59 |
4 files changed, 756 insertions, 570 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index b90fe56bfe..ec3ce69433 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -372,94 +372,112 @@ void tst_QQuickItem::activeFocusOnTab() QVERIFY(item->hasActiveFocus()); // Tab: button12->sub2 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "sub2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "sub2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // Tab: sub2->button21 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button21"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button21"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // Tab: button21->button22 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button22"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button22"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // Tab: button22->edit - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + item = findItem<QQuickItem>(window->rootObject(), "edit"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: edit->button22 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "button22"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + item = findItem<QQuickItem>(window->rootObject(), "button22"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button22->button21 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button21"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button21"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button21->sub2 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "sub2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "sub2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: sub2->button12 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button12"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button12"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button12->button11 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button11"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button11"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button11->edit - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "edit"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -484,22 +502,26 @@ void tst_QQuickItem::activeFocusOnTab2() QVERIFY(item->hasActiveFocus()); // BackTab: button12->button11 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button11"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button11"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button11->edit - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "edit"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -524,164 +546,192 @@ void tst_QQuickItem::activeFocusOnTab3() QVERIFY(item->hasActiveFocus()); // 4 Tabs: button1->button2, through a repeater - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 Tabs: button2->button3, through a row - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 Tabs: button3->button4, through a flow - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 Tabs: button4->button5, through a focusscope // parent is activeFocusOnTab:false, one of children is focus:true - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button5"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button5"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 Tabs: button5->button6, through a focusscope // parent is activeFocusOnTab:true, one of children is focus:true - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button6"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button6"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 5 Tabs: button6->button7, through a focusscope // parent is activeFocusOnTab:true, none of children is focus:true - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 5; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 5; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button7"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button7"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button7->button6, through a focusscope // parent is activeFocusOnTab:true, one of children got focus:true in previous code - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button6"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button6"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 Tabs: button6->button7, through a focusscope // parent is activeFocusOnTab:true, one of children got focus:true in previous code - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);; + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button7"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button7"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button7->button6, through a focusscope // parent is activeFocusOnTab:true, one of children got focus:true in previous code - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button6"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button6"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button6->button5, through a focusscope(parent is activeFocusOnTab: false) - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button5"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button5"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button5->button4, through a focusscope(parent is activeFocusOnTab: false) - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button4->button3, through a flow - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button3->button2, through a row - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // 4 BackTabs: button2->button1, through a repeater - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - for (int i = 0; i < 4; ++i) { - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - } + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + for (int i = 0; i < 4; ++i) { + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + } - item = findItem<QQuickItem>(window->rootObject(), "button1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -772,40 +822,48 @@ void tst_QQuickItem::activeFocusOnTab6() QVERIFY(item->hasActiveFocus()); // Tab: button12->edit - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "edit"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: edit->button12 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button12"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button12"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button12->button11 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "button11"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "button11"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button11->edit - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "edit"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -830,18 +888,22 @@ void tst_QQuickItem::activeFocusOnTab7() QVERIFY(item->hasActiveFocus()); // Tab: button1->button1 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(!key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(!key.isAccepted()); - QVERIFY(item->hasActiveFocus()); + QVERIFY(item->hasActiveFocus()); + } // BackTab: button1->button1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(!key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(!key.isAccepted()); - QVERIFY(item->hasActiveFocus()); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -870,27 +932,33 @@ void tst_QQuickItem::activeFocusOnTab8() QVERIFY(!button2->hasActiveFocus()); // Tab: contentItem->button1 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(button1->hasActiveFocus()); + QVERIFY(button1->hasActiveFocus()); + } // Tab: button1->button2 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(button2->hasActiveFocus()); - QVERIFY(!button1->hasActiveFocus()); + QVERIFY(button2->hasActiveFocus()); + QVERIFY(!button1->hasActiveFocus()); + } // BackTab: button2->button1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(button1->hasActiveFocus()); - QVERIFY(!button2->hasActiveFocus()); + QVERIFY(button1->hasActiveFocus()); + QVERIFY(!button2->hasActiveFocus()); + } delete window; } @@ -923,25 +991,31 @@ void tst_QQuickItem::activeFocusOnTab9() QVERIFY(textinput1->hasActiveFocus()); // Tab: textinput1->textedit1 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textedit1->hasActiveFocus()); + QVERIFY(textedit1->hasActiveFocus()); + } // BackTab: textedit1->textinput1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textinput1->hasActiveFocus()); + QVERIFY(textinput1->hasActiveFocus()); + } // BackTab: textinput1->textedit1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textedit1->hasActiveFocus()); + QVERIFY(textedit1->hasActiveFocus()); + } delete window; } @@ -978,53 +1052,67 @@ void tst_QQuickItem::activeFocusOnTab10() QVERIFY(textinput1->hasActiveFocus()); // Tab: textinput1->textinput2 - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textinput2->hasActiveFocus()); + QVERIFY(textinput2->hasActiveFocus()); + } // Tab: textinput2->textedit1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textedit1->hasActiveFocus()); + QVERIFY(textedit1->hasActiveFocus()); + } // BackTab: textedit1->textinput2 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textinput2->hasActiveFocus()); + QVERIFY(textinput2->hasActiveFocus()); + } // BackTab: textinput2->textinput1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textinput1->hasActiveFocus()); + QVERIFY(textinput1->hasActiveFocus()); + } // BackTab: textinput1->textedit2 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textedit2->hasActiveFocus()); + QVERIFY(textedit2->hasActiveFocus()); + } // BackTab: textedit2->textedit1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textedit1->hasActiveFocus()); + QVERIFY(textedit1->hasActiveFocus()); + } // BackTab: textedit1->textinput2 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - QVERIFY(textinput2->hasActiveFocus()); + QVERIFY(textinput2->hasActiveFocus()); + } delete window; } @@ -1332,112 +1420,134 @@ void tst_QQuickItem::keys() QVERIFY(window->rootObject()); QCOMPARE(window->rootObject()->property("isEnabled").toBool(), true); - QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_A)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A)); - QCOMPARE(testObject->mText, QLatin1String("A")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(!key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_A)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A)); + QCOMPARE(testObject->mText, QLatin1String("A")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(!key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::ShiftModifier, "A", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_A)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A)); - QCOMPARE(testObject->mText, QLatin1String("A")); - QCOMPARE(testObject->mModifiers, int(Qt::ShiftModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::ShiftModifier, "A", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_A)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A)); + QCOMPARE(testObject->mText, QLatin1String("A")); + QCOMPARE(testObject->mModifiers, int(Qt::ShiftModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_Return)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Return)); - QCOMPARE(testObject->mText, QLatin1String("Return")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_Return)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Return)); + QCOMPARE(testObject->mText, QLatin1String("Return")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_0, Qt::NoModifier, "0", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_0)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_0)); - QCOMPARE(testObject->mText, QLatin1String("0")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_0, Qt::NoModifier, "0", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_0)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_0)); + QCOMPARE(testObject->mText, QLatin1String("0")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_9, Qt::NoModifier, "9", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_9)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_9)); - QCOMPARE(testObject->mText, QLatin1String("9")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(!key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_9, Qt::NoModifier, "9", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_9)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_9)); + QCOMPARE(testObject->mText, QLatin1String("9")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(!key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_Tab)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Tab)); - QCOMPARE(testObject->mText, QLatin1String("Tab")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_Tab)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Tab)); + QCOMPARE(testObject->mText, QLatin1String("Tab")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_Backtab)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Backtab)); - QCOMPARE(testObject->mText, QLatin1String("Backtab")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_Backtab)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Backtab)); + QCOMPARE(testObject->mText, QLatin1String("Backtab")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_VolumeUp, Qt::NoModifier, 1234, 0, 0); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_VolumeUp)); - QCOMPARE(testObject->mForwardedKey, int(Qt::Key_VolumeUp)); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QCOMPARE(testObject->mNativeScanCode, quint32(1234)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_VolumeUp, Qt::NoModifier, 1234, 0, 0); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_VolumeUp)); + QCOMPARE(testObject->mForwardedKey, int(Qt::Key_VolumeUp)); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QCOMPARE(testObject->mNativeScanCode, quint32(1234)); + QVERIFY(key.isAccepted()); + } testObject->reset(); - window->rootContext()->setContextProperty("forwardeeVisible", QVariant(false)); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_A)); - QCOMPARE(testObject->mForwardedKey, 0); - QCOMPARE(testObject->mText, QLatin1String("A")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(!key.isAccepted()); + { + window->rootContext()->setContextProperty("forwardeeVisible", QVariant(false)); + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_A)); + QCOMPARE(testObject->mForwardedKey, 0); + QCOMPARE(testObject->mText, QLatin1String("A")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(!key.isAccepted()); + } testObject->reset(); - window->rootContext()->setContextProperty("enableKeyHanding", QVariant(false)); - QCOMPARE(window->rootObject()->property("isEnabled").toBool(), false); + { + window->rootContext()->setContextProperty("enableKeyHanding", QVariant(false)); + QCOMPARE(window->rootObject()->property("isEnabled").toBool(), false); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, 0); - QVERIFY(!key.isAccepted()); + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, 0); + QVERIFY(!key.isAccepted()); + } - window->rootContext()->setContextProperty("enableKeyHanding", QVariant(true)); - QCOMPARE(window->rootObject()->property("isEnabled").toBool(), true); + { + window->rootContext()->setContextProperty("enableKeyHanding", QVariant(true)); + QCOMPARE(window->rootObject()->property("isEnabled").toBool(), true); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_Return)); - QVERIFY(key.isAccepted()); + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_Return)); + QVERIFY(key.isAccepted()); + } delete window; delete testObject; @@ -1524,12 +1634,14 @@ void tst_QQuickItem::keysProcessingOrder() QCOMPARE(testItem->property("priorityTest").toInt(), 0); - QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_A)); - QCOMPARE(testObject->mText, QLatin1String("A")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_A)); + QCOMPARE(testObject->mText, QLatin1String("A")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(key.isAccepted()); + } testObject->reset(); @@ -1537,26 +1649,32 @@ void tst_QQuickItem::keysProcessingOrder() QCOMPARE(testItem->property("priorityTest").toInt(), 1); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, 0); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, 0); + QVERIFY(key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_B, Qt::NoModifier, "B", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, int(Qt::Key_B)); - QCOMPARE(testObject->mText, QLatin1String("B")); - QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); - QVERIFY(!key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_B, Qt::NoModifier, "B", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, int(Qt::Key_B)); + QCOMPARE(testObject->mText, QLatin1String("B")); + QCOMPARE(testObject->mModifiers, int(Qt::NoModifier)); + QVERIFY(!key.isAccepted()); + } testObject->reset(); - key = QKeyEvent(QEvent::KeyRelease, Qt::Key_B, Qt::NoModifier, "B", false, 1); - QGuiApplication::sendEvent(window, &key); - QCOMPARE(testObject->mKey, 0); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyRelease, Qt::Key_B, Qt::NoModifier, "B", false, 1); + QGuiApplication::sendEvent(window, &key); + QCOMPARE(testObject->mKey, 0); + QVERIFY(key.isAccepted()); + } delete window; delete testObject; @@ -1870,58 +1988,70 @@ void tst_QQuickItem::keyNavigation() QVERIFY(result.toBool()); // right - QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // down - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // left - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // up - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // tab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // backtab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -1961,22 +2091,26 @@ void tst_QQuickItem::keyNavigation_RightToLeft() QVERIFY(result.toBool()); // right - QKeyEvent key(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // left - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -2003,31 +2137,37 @@ void tst_QQuickItem::keyNavigation_skipNotVisible() QVERIFY(!item->isVisible()); // right - QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // tab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // backtab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } //Set item 3 to not visible item = findItem<QQuickItem>(window->rootObject(), "item3"); @@ -2036,22 +2176,26 @@ void tst_QQuickItem::keyNavigation_skipNotVisible() QVERIFY(!item->isVisible()); // tab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // backtab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -2082,103 +2226,125 @@ void tst_QQuickItem::keyNavigation_implicitSetting() QVERIFY(result.toBool()); // right - QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // back to item1 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // down - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // move to item4 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // left - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // back to item4 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // up - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item2"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item2"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // back to item4 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // tab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item1"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item1"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // back to item4 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item4"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item4"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } // backtab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); - item = findItem<QQuickItem>(window->rootObject(), "item3"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); + item = findItem<QQuickItem>(window->rootObject(), "item3"); + QVERIFY(item); + QVERIFY(item->hasActiveFocus()); + } delete window; } @@ -2242,26 +2408,32 @@ void tst_QQuickItem::keyNavigation_focusReason() item->installEventFilter(&focusEventFilter); // tab - QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - QCOMPARE(focusEventFilter.lastFocusReason, Qt::TabFocusReason); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + QCOMPARE(focusEventFilter.lastFocusReason, Qt::TabFocusReason); + } // backtab - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - QCOMPARE(focusEventFilter.lastFocusReason, Qt::BacktabFocusReason); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + QCOMPARE(focusEventFilter.lastFocusReason, Qt::BacktabFocusReason); + } // right - it's also one kind of key navigation - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - QCOMPARE(focusEventFilter.lastFocusReason, Qt::TabFocusReason); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + QCOMPARE(focusEventFilter.lastFocusReason, Qt::TabFocusReason); - item->setFocus(true, Qt::OtherFocusReason); - QVERIFY(item->hasActiveFocus()); - QCOMPARE(focusEventFilter.lastFocusReason, Qt::OtherFocusReason); + item->setFocus(true, Qt::OtherFocusReason); + QVERIFY(item->hasActiveFocus()); + QCOMPARE(focusEventFilter.lastFocusReason, Qt::OtherFocusReason); + } delete window; } diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 6a9d5cedc0..9691e1fd80 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -1018,8 +1018,8 @@ void tst_QQuickMouseArea::doubleClick() QCOMPARE(window.rootObject()->property("released").toInt(), 1); QGuiApplication::sendEvent(&window, &pressEvent); - pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); - QGuiApplication::sendEvent(&window, &pressEvent); + QMouseEvent pressEvent2 = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); + QGuiApplication::sendEvent(&window, &pressEvent2); QGuiApplication::sendEvent(&window, &releaseEvent); QCOMPARE(window.rootObject()->property("clicked").toInt(), 1); @@ -1055,8 +1055,9 @@ void tst_QQuickMouseArea::clickTwice() QCOMPARE(window.rootObject()->property("clicked").toInt(), 1); QGuiApplication::sendEvent(&window, &pressEvent); - pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); - QGuiApplication::sendEvent(&window, &pressEvent); + + QMouseEvent pressEvent2 = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); + QGuiApplication::sendEvent(&window, &pressEvent2); QGuiApplication::sendEvent(&window, &releaseEvent); QCOMPARE(window.rootObject()->property("pressed").toInt(), 2); @@ -1091,8 +1092,8 @@ void tst_QQuickMouseArea::invalidClick() QCOMPARE(window.rootObject()->property("released").toInt(), 0); QGuiApplication::sendEvent(&window, &pressEvent); - pressEvent = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); - QGuiApplication::sendEvent(&window, &pressEvent); + QMouseEvent pressEvent2 = QMouseEvent(QEvent::MouseButtonDblClick, QPoint(100, 100), button, button, {}); + QGuiApplication::sendEvent(&window, &pressEvent2); QGuiApplication::sendEvent(&window, &releaseEvent); QCOMPARE(window.rootObject()->property("clicked").toInt(), 0); diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 41538896d2..8f657430bb 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -3589,13 +3589,15 @@ void tst_qquicktextedit::signal_editingfinished() QTRY_VERIFY(input1->hasActiveFocus()); QTRY_VERIFY(!input2->hasActiveFocus()); - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - QTRY_COMPARE(editingFinished1Spy.count(), 1); + { + QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + QTRY_COMPARE(editingFinished1Spy.count(), 1); - QTRY_VERIFY(!input1->hasActiveFocus()); - QTRY_VERIFY(input2->hasActiveFocus()); + QTRY_VERIFY(!input1->hasActiveFocus()); + QTRY_VERIFY(input2->hasActiveFocus()); + } QSignalSpy editingFinished2Spy(input2, SIGNAL(editingFinished())); @@ -3603,13 +3605,15 @@ void tst_qquicktextedit::signal_editingfinished() QTRY_VERIFY(!input1->hasActiveFocus()); QTRY_VERIFY(input2->hasActiveFocus()); - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - QTRY_COMPARE(editingFinished2Spy.count(), 1); + { + QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); + QGuiApplication::sendEvent(window, &key); + QVERIFY(key.isAccepted()); + QTRY_COMPARE(editingFinished2Spy.count(), 1); - QTRY_VERIFY(input1->hasActiveFocus()); - QTRY_VERIFY(!input2->hasActiveFocus()); + QTRY_VERIFY(input1->hasActiveFocus()); + QTRY_VERIFY(!input2->hasActiveFocus()); + } } void tst_qquicktextedit::clipRect() diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index a29122c0f4..d5478ce15f 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -327,22 +327,22 @@ public: protected: void mousePressEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << event->source(); QQuickWindow::mousePressEvent(event); } void mouseMoveEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << event->source(); QQuickWindow::mouseMoveEvent(event); } void mouseReleaseEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << event->source(); QQuickWindow::mouseReleaseEvent(event); } public: - QList<QMouseEvent> m_mouseEvents; + QList<Qt::MouseEventSource> m_mouseEvents; }; class MouseRecordingItem : public QQuickItem @@ -360,30 +360,35 @@ public: protected: void touchEvent(QTouchEvent* event) override { event->setAccepted(m_acceptTouch); - m_touchEvents << *event; + m_touchEvents << event->type(); qCDebug(lcTests) << "accepted?" << event->isAccepted() << event; } void mousePressEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << MouseEvent{event->type(), event->source()}; } void mouseMoveEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << MouseEvent{event->type(), event->source()}; } void mouseReleaseEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << MouseEvent{event->type(), event->source()}; } void mouseDoubleClickEvent(QMouseEvent *event) override { qCDebug(lcTests) << event; - m_mouseEvents << *event; + m_mouseEvents << MouseEvent{event->type(), event->source()}; } public: - QList<QMouseEvent> m_mouseEvents; - QList<QTouchEvent> m_touchEvents; + struct MouseEvent + { + QEvent::Type type; + Qt::MouseEventSource source; + }; + QList<MouseEvent> m_mouseEvents; + QList<QEvent::Type> m_touchEvents; private: bool m_acceptTouch; @@ -1263,8 +1268,8 @@ void tst_qquickwindow::synthMouseFromTouch() QCOMPARE(item->m_touchEvents.count(), !synthMouse && !acceptTouch ? 1 : 3); QCOMPARE(item->m_mouseEvents.count(), (acceptTouch || !synthMouse) ? 0 : 3); QCOMPARE(window->m_mouseEvents.count(), 0); - for (const QMouseEvent &ev : item->m_mouseEvents) - QCOMPARE(ev.source(), Qt::MouseEventSynthesizedByQt); + for (const auto &ev : item->m_mouseEvents) + QCOMPARE(ev.source, Qt::MouseEventSynthesizedByQt); } void tst_qquickwindow::synthMouseDoubleClickFromTouch_data() @@ -1311,7 +1316,7 @@ void tst_qquickwindow::synthMouseDoubleClickFromTouch() QVERIFY(eventCount >= 2); const int nDoubleClicks = std::count_if(item->m_mouseEvents.constBegin(), item->m_mouseEvents.constEnd(), - [](const QMouseEvent &ev) { return (ev.type() == QEvent::MouseButtonDblClick); } ); + [](const MouseRecordingItem::MouseEvent &ev) { return (ev.type == QEvent::MouseButtonDblClick); } ); const bool foundDoubleClick = (nDoubleClicks == 1); QCOMPARE(foundDoubleClick, expectedSynthesizedDoubleClickEvent); @@ -2114,17 +2119,21 @@ void tst_qquickwindow::requestActivate() //copied from src/qmltest/quicktestevent.cpp QPoint pos = item->mapToScene(QPointF(item->width()/2, item->height()/2)).toPoint(); - QMouseEvent me(QEvent::MouseButtonPress, pos, window1->mapToGlobal(pos), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - QSpontaneKeyEvent::setSpontaneous(&me); - if (!qApp->notify(window1.data(), &me)) { - QString warning = QString::fromLatin1("Mouse event MousePress not accepted by receiving window"); - QWARN(warning.toLatin1().data()); - } - me = QMouseEvent(QEvent::MouseButtonPress, pos, window1->mapToGlobal(pos), Qt::LeftButton, {}, Qt::NoModifier); - QSpontaneKeyEvent::setSpontaneous(&me); - if (!qApp->notify(window1.data(), &me)) { - QString warning = QString::fromLatin1("Mouse event MouseRelease not accepted by receiving window"); - QWARN(warning.toLatin1().data()); + { + QMouseEvent me(QEvent::MouseButtonPress, pos, window1->mapToGlobal(pos), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + QSpontaneKeyEvent::setSpontaneous(&me); + if (!qApp->notify(window1.data(), &me)) { + QString warning = QString::fromLatin1("Mouse event MousePress not accepted by receiving window"); + QWARN(warning.toLatin1().data()); + } + } + { + QMouseEvent me = QMouseEvent(QEvent::MouseButtonPress, pos, window1->mapToGlobal(pos), Qt::LeftButton, {}, Qt::NoModifier); + QSpontaneKeyEvent::setSpontaneous(&me); + if (!qApp->notify(window1.data(), &me)) { + QString warning = QString::fromLatin1("Mouse event MouseRelease not accepted by receiving window"); + QWARN(warning.toLatin1().data()); + } } QTRY_COMPARE(QGuiApplication::focusWindow(), windows.at(0)); |