AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTest: fall back to qWaitForWindowExposed in qWaitForWindowActivated

Browse Source 
...if window activation isn't supported.

Task-number: QTBUG-62188
Change-Id: Ia83de59d9a755d95b7150eb5261bc43dd7b60588
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-10-11 15:19:45 +02:00
parent 332c255c69
commit 51f092905a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/kernel/qtestsupport_gui.cpp
View File

@ -37,10 +37,15 @@
** **
****************************************************************************/ ****************************************************************************/
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
#include "qtestsupport_gui.h" #include "qtestsupport_gui.h"
#include "qwindow.h" #include "qwindow.h"
#include <QtCore/qtestsupport_core.h> #include <QtCore/qtestsupport_core.h>
#include <QtCore/QDebug>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -55,6 +60,14 @@ QT_BEGIN_NAMESPACE
*/ */
Q_GUI_EXPORT bool QTest::qWaitForWindowActive(QWindow *window, int timeout) Q_GUI_EXPORT bool QTest::qWaitForWindowActive(QWindow *window, int timeout)
{ {
if (Q_UNLIKELY(!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))) {
qWarning() << "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.";
return qWaitForWindowExposed(window, timeout);
}
return QTest::qWaitFor([&]() { return window->isActive(); }, timeout); return QTest::qWaitFor([&]() { return window->isActive(); }, timeout);
} }