|
1 | 1 | // local headers |
2 | 2 | #include "PluginsDeployerFactory.h" |
3 | 3 | #include "BasicPluginsDeployer.h" |
4 | | -#include "PlatformPluginsDeployer.h" |
5 | 4 | #include "BearerPluginsDeployer.h" |
6 | 5 | #include "GamepadPluginsDeployer.h" |
7 | 6 | #include "LocationPluginsDeployer.h" |
8 | 7 | #include "Multimedia5PluginsDeployer.h" |
9 | 8 | #include "Multimedia6PluginsDeployer.h" |
10 | | -#include "PrintSupportPluginsDeployer.h" |
| 9 | +#include "NetworkInformationPluginsDeployer.h" |
| 10 | +#include "PlatformPluginsDeployer.h" |
11 | 11 | #include "PositioningPluginsDeployer.h" |
| 12 | +#include "PrintSupportPluginsDeployer.h" |
12 | 13 | #include "QmlPluginsDeployer.h" |
13 | 14 | #include "Qt3DPluginsDeployer.h" |
14 | 15 | #include "SqlPluginsDeployer.h" |
15 | 16 | #include "SvgPluginsDeployer.h" |
16 | 17 | #include "TextToSpeechPluginsDeployer.h" |
17 | | -#include "WebEnginePluginsDeployer.h" |
18 | | -#include "XcbglIntegrationPluginsDeployer.h" |
19 | 18 | #include "TlsBackendsDeployer.h" |
20 | 19 | #include "WaylandcompositorPluginsDeployer.h" |
| 20 | +#include "WebEnginePluginsDeployer.h" |
| 21 | +#include "XcbglIntegrationPluginsDeployer.h" |
21 | 22 |
|
22 | 23 | using namespace linuxdeploy::plugin::qt; |
23 | 24 | using namespace linuxdeploy::core::appdir; |
@@ -51,8 +52,16 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye |
51 | 52 | if (moduleName == "network") { |
52 | 53 | if (qtMajorVersion < 6) { |
53 | 54 | return {getInstance<BearerPluginsDeployer>(moduleName)}; |
54 | | - } else if (qtMinorVersion >= 2) { |
55 | | - return {getInstance<TlsBackendsDeployer>(moduleName)}; |
| 55 | + } else { |
| 56 | + std::vector<std::shared_ptr<PluginsDeployer>> deployers; |
| 57 | + if (qtMinorVersion >= 1) { |
| 58 | + deployers.push_back( |
| 59 | + getInstance<NetworkInformationPluginsDeployer>(moduleName)); |
| 60 | + } |
| 61 | + if (qtMinorVersion >= 2) { |
| 62 | + deployers.push_back(getInstance<TlsBackendsDeployer>(moduleName)); |
| 63 | + } |
| 64 | + return deployers; |
56 | 65 | } |
57 | 66 | } |
58 | 67 |
|
|
0 commit comments