diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/kernel.pri | 7 | ||||
-rw-r--r-- | src/gui/kernel/qtestsupport_gui.cpp | 83 | ||||
-rw-r--r-- | src/gui/kernel/qtestsupport_gui.h | 56 |
3 files changed, 143 insertions, 3 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 3b9afdfe8b..1f137fc46f 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -74,8 +74,8 @@ HEADERS += \ kernel/qplatformgraphicsbufferhelper.h \ kernel/qinputdevicemanager_p.h \ kernel/qinputdevicemanager_p_p.h \ - kernel/qhighdpiscaling_p.h - + kernel/qhighdpiscaling_p.h \ + kernel/qtestsupport_gui.h SOURCES += \ kernel/qgenericpluginfactory.cpp \ @@ -128,7 +128,8 @@ SOURCES += \ kernel/qplatformgraphicsbuffer.cpp \ kernel/qplatformgraphicsbufferhelper.cpp \ kernel/qinputdevicemanager.cpp \ - kernel/qhighdpiscaling.cpp + kernel/qhighdpiscaling.cpp \ + kernel/qtestsupport_gui.cpp qtConfig(draganddrop) { HEADERS += \ diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp new file mode 100644 index 0000000000..56e0eb52b3 --- /dev/null +++ b/src/gui/kernel/qtestsupport_gui.cpp @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtTest module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtestsupport_gui.h" +#include "qwindow.h" + +#include <QtCore/qtestsupport_core.h> + +QT_BEGIN_NAMESPACE + +/*! \fn bool qWaitForWindowActive(QWindow *window, int timeout) + \relates QTest + \since 5.0 + + Waits for \a timeout milliseconds or until the \a window is active. + + Returns \c true if \c window is active within \a timeout milliseconds, otherwise returns \c false. + + \sa QTest::qWaitForWindowExposed(), QWindow::isActive() +*/ +Q_GUI_EXPORT bool QTest::qWaitForWindowActive(QWindow *window, int timeout) +{ + return QTest::qWaitFor([&]() { return window->isActive(); }, timeout); +} + +/*! \fn bool qWaitForWindowExposed(QWindow *window, int timeout) + \relates QTest + \since 5.0 + + Waits for \a timeout milliseconds or until the \a window is exposed. + Returns \c true if \c window is exposed within \a timeout milliseconds, otherwise returns \c false. + + This is mainly useful for asynchronous systems like X11, where a window will be mapped to screen some + time after being asked to show itself on the screen. + + Note that a window that is mapped to screen may still not be considered exposed if the window client + area is completely covered by other windows, or if the window is otherwise not visible. This function + will then time out when waiting for such a window. + + \sa QTest::qWaitForWindowActive(), QWindow::isExposed() +*/ +Q_GUI_EXPORT bool QTest::qWaitForWindowExposed(QWindow *window, int timeout) +{ + return QTest::qWaitFor([&]() { return window->isExposed(); }, timeout); +} + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qtestsupport_gui.h b/src/gui/kernel/qtestsupport_gui.h new file mode 100644 index 0000000000..1d84591060 --- /dev/null +++ b/src/gui/kernel/qtestsupport_gui.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtTest module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTESTSUPPORT_GUI_H +#define QTESTSUPPORT_GUI_H + +#include "qtguiglobal.h" + +QT_BEGIN_NAMESPACE + +class QWindow; + +namespace QTest { +Q_GUI_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowActive(QWindow *window, int timeout = 5000); +Q_GUI_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowExposed(QWindow *window, int timeout = 5000); +} + +QT_END_NAMESPACE + +#endif |