summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2023-11-29 09:50:16 +0100
committerMichal Klocek <michal.klocek@qt.io>2023-11-29 15:12:47 +0100
commit4a8702d63ee3d46b8b267fee3b87544f16e03eb8 (patch)
tree56638cee77a54ec7e3333d461f887e714fce5992
parente01a8951d3607066d8edd10266ed1cb8ca1dd3bc (diff)
Fix compilation arm64
Add missing header include. Do not compile global setting tests as it tests so far only doh and requires ssl. Fixes: QTBUG-119525 Change-Id: I011cd3b0ed6e9d5e55e1fc80a102cc7a388681f1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/core/web_contents_delegate_qt.h1
-rw-r--r--tests/auto/core/CMakeLists.txt5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 23115d126..51004878d 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -12,6 +12,7 @@
#include "web_contents_adapter_client.h"
#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
namespace blink {
namespace web_pref {
diff --git a/tests/auto/core/CMakeLists.txt b/tests/auto/core/CMakeLists.txt
index fca524254..4ed41d947 100644
--- a/tests/auto/core/CMakeLists.txt
+++ b/tests/auto/core/CMakeLists.txt
@@ -4,7 +4,10 @@
add_subdirectory(qwebenginecookiestore)
add_subdirectory(qwebengineloadinginfo)
add_subdirectory(qwebenginesettings)
-add_subdirectory(qwebengineglobalsettings)
+if(QT_FEATURE_ssl)
+ # only tests doh, and requires ssl
+ add_subdirectory(qwebengineglobalsettings)
+endif()
add_subdirectory(qwebengineurlrequestinterceptor)
add_subdirectory(qwebengineurlrequestjob)
add_subdirectory(origins)