aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-11 14:51:05 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-11 17:06:29 +0100
commit2724b37a392efdb4bb08147e1672dfd28e2a3635 (patch)
tree42681f5b6105857f200aac606337f6c7cff33e5d
parent97cb0ef9c45ceaf89189540dd740382ce32e2618 (diff)
Don't copy or assign QKeyEvent instances
Change-Id: Id16f972a7f2c0f3c9c9d2fe1d14b9e0830a85a0a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp84
1 files changed, 48 insertions, 36 deletions
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index b2535ccb..7816622c 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -138,31 +138,37 @@ void tst_QQuickApplicationWindow::activeFocusOnTab1()
QVERIFY(!item->hasActiveFocus());
// Tab: contentItem->sub1
- 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->contentItem(), "sub1");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub1");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
// Tab: sub1->sub2
- 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->contentItem(), "sub2");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub2");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
// Tab: sub2->sub1
- 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->contentItem(), "sub1");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub1");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
}
void tst_QQuickApplicationWindow::activeFocusOnTab2()
@@ -190,31 +196,37 @@ void tst_QQuickApplicationWindow::activeFocusOnTab2()
QVERIFY(!item->hasActiveFocus());
// BackTab: contentItem->sub2
- 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->contentItem(), "sub2");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub2");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
// BackTab: sub2->sub1
- 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->contentItem(), "sub1");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub1");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
// BackTab: sub1->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->contentItem(), "sub2");
- QVERIFY(item);
- QVERIFY(item->hasActiveFocus());
+ item = findItem<QQuickItem>(window->contentItem(), "sub2");
+ QVERIFY(item);
+ QVERIFY(item->hasActiveFocus());
+ }
}
void tst_QQuickApplicationWindow::defaultFocus()