1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix testlib/tst_selftests::keyboard on Wayland"

Browse Source
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-02-25 12:04:09 +01:00 committed by Qt CI Bot
commit 2f9a3352b2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp
View File

@ -28,6 +28,8 @@
#include <QtTest/qtest.h> #include <QtTest/qtest.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <QtGui/private/qguiapplication_p.h>
#include <QtGui/qpa/qplatformintegration.h>
class tst_Keyboard : public QObject class tst_Keyboard : public QObject
{ {
@ -63,6 +65,15 @@ void tst_Keyboard::keyPressAndRelease()
window.show(); window.show();
window.setGeometry(100, 100, 200, 200); window.setGeometry(100, 100, 200, 200);
QVERIFY(QTest::qWaitForWindowExposed(&window)); QVERIFY(QTest::qWaitForWindowExposed(&window));
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) {
QTest::ignoreMessage(QtWarningMsg,
"qWaitForWindowActive was called on a platform that doesn't support window "
"activation. This means there is an error in the test and it should either "
"check for the WindowActivation platform capability before calling "
"qWaitForWindowActivate, use qWaitForWindowExposed instead, or skip the test. "
"Falling back to qWaitForWindowExposed.");
}
QVERIFY(QTest::qWaitForWindowActive(&window)); QVERIFY(QTest::qWaitForWindowActive(&window));
QTest::keyPress(&window, Qt::Key_A); QTest::keyPress(&window, Qt::Key_A);