From d0852f90a24673ccc9ef0b93e224ba37b674644d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 20 Apr 2020 16:18:59 +0200
Subject: Fix building dev with newer QtBase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0d52e4f6684425cb15319760e0001bdb13846997
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
---
 tests/auto/quick/publicapi/tst_publicapi.cpp             | 2 ++
 tests/auto/quick/quick.pro                               | 2 ++
 tests/auto/widgets/origins/tst_origins.cpp               | 2 +-
 tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index aaca7997b..bc8f61562 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -771,7 +771,9 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.url --> QUrl"
     << "QQuickWebEngineView.urlChanged() --> void"
     << "QQuickWebEngineView.userScripts --> QQmlListProperty<QQuickWebEngineScript>"
+#if QT_CONFIG(webengine_webchannel)
     << "QQuickWebEngineView.webChannel --> QQmlWebChannel*"
+#endif
     << "QQuickWebEngineView.webChannelChanged() --> void"
     << "QQuickWebEngineView.webChannelWorld --> uint"
     << "QQuickWebEngineView.webChannelWorldChanged(uint) --> void"
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 81b62b4e7..f9d84b3b4 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -17,5 +17,7 @@ qtConfig(webengine-testsupport) {
         qquickwebengineviewgraphics
 }
 
+!qtHaveModule(quickcontrols): SUBDIRS -= qmltests
+
 # QTBUG-66055
 boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests
diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index e3927f763..c4691ad74 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -41,7 +41,7 @@
 #include <QtWebSockets/qwebsocketserver.h>
 #include <QtWebChannel/qwebchannel.h>
 #endif
-#include <QtWidgets/qaction.h>
+#include <qaction.h>
 
 #define QSL QStringLiteral
 #define QBAL QByteArrayLiteral
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 5e16361c5..d5a2ecf49 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -29,8 +29,9 @@
 #include <qwebengineview.h>
 #include <qwebenginepage.h>
 #include <qwebenginesettings.h>
-#include <qnetworkrequest.h>
+#include <qaction.h>
 #include <qdiriterator.h>
+#include <qnetworkrequest.h>
 #include <qstackedlayout.h>
 #include <qtemporarydir.h>
 #include <QClipboard>
@@ -45,7 +46,6 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QStyle>
-#include <QtWidgets/qaction.h>
 #include <QWebEngineProfile>
 #include <QtCore/qregularexpression.h>
 
-- 
cgit v1.2.3