diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /tests/auto/quick/shared/util.h | |
parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
parent | 7978feadee937299798372bced1680f52b4b1842 (diff) |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'tests/auto/quick/shared/util.h')
-rw-r--r-- | tests/auto/quick/shared/util.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h index 8f7a85f68..66b42d010 100644 --- a/tests/auto/quick/shared/util.h +++ b/tests/auto/quick/shared/util.h @@ -119,7 +119,16 @@ inline bool waitForLoadFailed(QQuickWebEngineView *webEngineView, int timeout = inline bool waitForViewportReady(QQuickWebEngineView *webEngineView, int timeout = 10000) { - return waitForSignal(reinterpret_cast<QObject *>(webEngineView->experimental()), SIGNAL(loadVisuallyCommitted()), timeout); +#ifdef ENABLE_QML_TESTSUPPORT_API + return waitForSignal(reinterpret_cast<QObject *>(webEngineView->testSupport()), SIGNAL(loadVisuallyCommitted()), timeout); +#else + Q_UNUSED(webEngineView) + Q_UNUSED(timeout) + qFatal("Test Support API is disabled. The result is not reliable.\ + Use the following command to build Test Support module and rebuild WebEngineView API:\ + qmake -r WEBENGINE_CONFIG+=testsupport && make"); + return false; +#endif } #endif /* UTIL_H */ |