From 7242afcfbe17ca5d9d6d2c4384aba84185b7992e Mon Sep 17 00:00:00 2001
From: rgriebl <robert@griebl.org>
Date: Wed, 31 Jan 2024 17:00:58 +0100
Subject: [PATCH 1/2] Qt6: Add support for networkinformation plugins
Qt 6.1 added https://doc.qt.io/qt-6/qnetworkinformation.html to the network module, but this needs plugins in `networkinformation` to be deployed.
Signed-off-by: rgriebl <robert@griebl.org>
---
src/Deploy/src/pluginsparser.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Deploy/src/pluginsparser.cpp b/src/Deploy/src/pluginsparser.cpp
index e3f53b4..e9fb3b6 100644
--- a/src/Deploy/src/pluginsparser.cpp
+++ b/src/Deploy/src/pluginsparser.cpp
@@ -38,6 +38,7 @@ static const PluginModuleMapping pluginModuleMappings[] =
{"playlistformats", DeployCore::QtModule::QtMultimediaModule},
{"bearer", DeployCore::QtModule::QtNetworkModule},
{"tls", DeployCore::QtModule::QtNetworkModule},
+ {"networkinformation", DeployCore::QtModule::QtNetworkModule},
{"position", DeployCore::QtModule::QtPositioningModule},
{"printsupport", DeployCore::QtModule::QtPrintSupportModule},
{"scenegraph", DeployCore::QtModule::QtQuickModule},
From 776954195a073a9f28c8e20dba3cb55be4517827 Mon Sep 17 00:00:00 2001
From: rgriebl <robert@griebl.org>
Date: Thu, 1 Feb 2024 01:04:22 +0100
Subject: [PATCH 2/2] Adapt tests to the added networkinformation plugins
Signed-off-by: rgriebl <robert@griebl.org>
---
tests/modules/modulesqt6_3.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/modules/modulesqt6_3.cpp b/tests/modules/modulesqt6_3.cpp
index 4ca1a03..ea5bdcd 100644
--- a/tests/modules/modulesqt6_3.cpp
+++ b/tests/modules/modulesqt6_3.cpp
@@ -407,6 +407,7 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
"./" + distDir + "/plugins/tls/qcertonlybackend.dll",
"./" + distDir + "/plugins/tls/qopensslbackend.dll",
"./" + distDir + "/plugins/tls/qschannelbackend.dll",
+ "./" + distDir + "/plugins/networkinformation/qnetworklistmanager.dll",
"./" + distDir + "/translations/qtdeclarative_ar.qm",
"./" + distDir + "/translations/qtdeclarative_bg.qm",
"./" + distDir + "/translations/qtdeclarative_ca.qm",
@@ -452,6 +453,7 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
"./" + distDir + "/lib/libQt6WaylandEglCompositorHwIntegration.so",
"./" + distDir + "/plugins/tls/libqcertonlybackend.so",
"./" + distDir + "/plugins/tls/libqopensslbackend.so",
+ "./" + distDir + "/plugins/networkinformation/libqnetworkmanager.so",
"./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
@@ -1237,6 +1239,7 @@ QSet<QString> ModulesQt63::qtWebEngineWidgets(const QString &distDir) const {
"./" + distDir + "/plugins/printsupport/libcupsprintersupport.so",
"./" + distDir + "/plugins/tls/libqcertonlybackend.so",
"./" + distDir + "/plugins/tls/libqopensslbackend.so",
+ "./" + distDir + "/plugins/networkinformation/libqnetworkmanager.so",
"./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",