Merge pull request #791 from rgriebl/patch-1

Qt6: Add support for networkinformation plugins
QuasarApp · Feb 5, 2024 · eb3a750 · eb3a750
2 parents 3b73ed3 + 7769541
commit eb3a750
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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},

diff --git 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",