diff options
Diffstat (limited to 'tests/auto/testlib/selftests/keyboard')
4 files changed, 21 insertions, 62 deletions
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt deleted file mode 100644 index 3eb954cfa6..0000000000 --- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from keyboard.pro. - -##################################################################### -## keyboard Binary: -##################################################################### - -qt_add_executable(keyboard - SOURCES - tst_keyboard.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::GuiPrivate - Qt::Test - Qt::TestPrivate -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt index 120cf1f82c..a1c1482e04 100644 --- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt @@ -1,15 +1,17 @@ -# Generated from keyboard.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## keyboard Binary: ##################################################################### -qt_add_executable(keyboard - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(keyboard + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_keyboard.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::GuiPrivate Qt::Test @@ -19,6 +21,4 @@ qt_add_executable(keyboard ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(keyboard) -# special case end +qt_internal_apply_testlib_coverage_options(keyboard) diff --git a/tests/auto/testlib/selftests/keyboard/keyboard.pro b/tests/auto/testlib/selftests/keyboard/keyboard.pro deleted file mode 100644 index 488c992e62..0000000000 --- a/tests/auto/testlib/selftests/keyboard/keyboard.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_keyboard.cpp -QT += testlib testlib-private gui gui-private - -macos:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = keyboard - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp index 0f0e90e2cb..1d6b8bb962 100644 --- a/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp +++ b/tests/auto/testlib/selftests/keyboard/tst_keyboard.cpp @@ -1,33 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/qtest.h> #include <QtGui/qwindow.h> +#include <QtGui/private/qguiapplication_p.h> +#include <QtGui/qpa/qplatformintegration.h> class tst_Keyboard : public QObject { @@ -63,6 +40,15 @@ void tst_Keyboard::keyPressAndRelease() window.show(); window.setGeometry(100, 100, 200, 200); 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)); QTest::keyPress(&window, Qt::Key_A); |