From db62139e1daea171e08d95592c63f663789d6391 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 1 Aug 2018 15:04:35 +0200
Subject: Make WebChannel an optional feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add webengine-webchannel feature.

Change-Id: I600572180f8169aafe79cf0408527cc087d9a007
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
---
 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 4ce971c4b..95a46fbc2 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -20,6 +20,7 @@
 */
 
 #include "../util.h"
+#include <QtWebEngineCore/qtwebenginecore-config.h>
 #include <QByteArray>
 #include <QClipboard>
 #include <QDir>
@@ -39,7 +40,9 @@
 #include <QtGui/QClipboard>
 #include <QtTest/QtTest>
 #include <QTextCharFormat>
+#if QT_CONFIG(webengine_webchannel)
 #include <QWebChannel>
+#endif
 #include <httpserver.h>
 #include <qnetworkcookiejar.h>
 #include <qnetworkreply.h>
@@ -200,8 +203,9 @@ private Q_SLOTS:
     void loadInSignalHandlers_data();
     void loadInSignalHandlers();
     void loadFromQrc();
-
+#if QT_CONFIG(webengine_webchannel)
     void restoreHistory();
+#endif
     void toPlainTextLoadFinishedRace_data();
     void toPlainTextLoadFinishedRace();
     void setZoomFactor();
@@ -3950,6 +3954,7 @@ void tst_QWebEnginePage::loadFromQrc()
     QCOMPARE(spy.takeFirst().value(0).toBool(), false);
 }
 
+#if QT_CONFIG(webengine_webchannel)
 void tst_QWebEnginePage::restoreHistory()
 {
     QWebChannel channel;
@@ -3977,6 +3982,7 @@ void tst_QWebEnginePage::restoreHistory()
     QCOMPARE(page.webChannel(), &channel);
     QVERIFY(page.scripts().contains(script));
 }
+#endif
 
 void tst_QWebEnginePage::toPlainTextLoadFinishedRace_data()
 {
-- 
cgit v1.2.3