Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/deployers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ set(CLASSES
LocationPluginsDeployer
Multimedia5PluginsDeployer
Multimedia6PluginsDeployer
NetworkInformationPluginsDeployer
WebEnginePluginsDeployer
QmlPluginsDeployer
Qt3DPluginsDeployer
Expand Down
11 changes: 11 additions & 0 deletions src/deployers/NetworkInformationPluginsDeployer.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include "NetworkInformationPluginsDeployer.h"

namespace linuxdeploy {
namespace plugin {
namespace qt {
bool NetworkInformationPluginsDeployer::doDeploy() {
return deployStandardQtPlugins({"networkinformation"});
}
} // namespace qt
} // namespace plugin
} // namespace linuxdeploy
17 changes: 17 additions & 0 deletions src/deployers/NetworkInformationPluginsDeployer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#pragma once

#include "BasicPluginsDeployer.h"

namespace linuxdeploy {
namespace plugin {
namespace qt {
class NetworkInformationPluginsDeployer : public BasicPluginsDeployer {
public:
// we can just use the base class's constructor
using BasicPluginsDeployer::BasicPluginsDeployer;

bool doDeploy() override;
};
} // namespace qt
} // namespace plugin
} // namespace linuxdeploy
21 changes: 15 additions & 6 deletions src/deployers/PluginsDeployerFactory.cpp
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
// local headers
#include "PluginsDeployerFactory.h"
#include "BasicPluginsDeployer.h"
#include "PlatformPluginsDeployer.h"
#include "BearerPluginsDeployer.h"
#include "GamepadPluginsDeployer.h"
#include "LocationPluginsDeployer.h"
#include "Multimedia5PluginsDeployer.h"
#include "Multimedia6PluginsDeployer.h"
#include "PrintSupportPluginsDeployer.h"
#include "NetworkInformationPluginsDeployer.h"
#include "PlatformPluginsDeployer.h"
#include "PositioningPluginsDeployer.h"
#include "PrintSupportPluginsDeployer.h"
#include "QmlPluginsDeployer.h"
#include "Qt3DPluginsDeployer.h"
#include "SqlPluginsDeployer.h"
#include "SvgPluginsDeployer.h"
#include "TextToSpeechPluginsDeployer.h"
#include "WebEnginePluginsDeployer.h"
#include "XcbglIntegrationPluginsDeployer.h"
#include "TlsBackendsDeployer.h"
#include "WaylandcompositorPluginsDeployer.h"
#include "WebEnginePluginsDeployer.h"
#include "XcbglIntegrationPluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::appdir;
Expand Down Expand Up @@ -51,8 +52,16 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye
if (moduleName == "network") {
if (qtMajorVersion < 6) {
return {getInstance<BearerPluginsDeployer>(moduleName)};
} else if (qtMinorVersion >= 2) {
return {getInstance<TlsBackendsDeployer>(moduleName)};
} else {
std::vector<std::shared_ptr<PluginsDeployer>> deployers;
if (qtMinorVersion >= 1) {
deployers.push_back(
getInstance<NetworkInformationPluginsDeployer>(moduleName));
}
if (qtMinorVersion >= 2) {
deployers.push_back(getInstance<TlsBackendsDeployer>(moduleName));
}
return deployers;
}
}

Expand Down