diff options
author | Christian Strømme <christian.stromme@qt.io> | 2018-01-25 11:43:55 +0100 |
---|---|---|
committer | Christian Stromme <christian.stromme@qt.io> | 2018-01-27 08:30:56 +0000 |
commit | cdca8a5af3dfd1a56c2c070f8b9b25717168324f (patch) | |
tree | f07856248b703caaebc4ec2dbccf261bd51867a3 /src/macdeployqt/shared/shared.cpp | |
parent | 135482d36409b5763292c1bf92a8bae7b8322bbe (diff) |
macdeployqt: Handle deployment of QtWebView's plugins
This change makes sure that the plugins are deployed correctly
Change-Id: Ia967525bcbdf97f86385b68e5a4039f5b5f8ee20
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/macdeployqt/shared/shared.cpp')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a2284a192..977e7c4c3 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1079,6 +1079,20 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl }); } + // WebView plugins if QtWebView.framework is in use + if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtWebView") + libInfixWithFramework)) { + addPlugins(QStringLiteral("webview"), [](const QString &lib) { + if (lib.startsWith(QStringLiteral("libqtwebview_webengine"))) { + LogWarning() << "Plugin" << lib << "uses QtWebEngine and is not Mac App store compliant."; + if (appstoreCompliant) { + LogWarning() << "Skip plugin" << lib; + return false; + } + } + return true; + }); + } + static const std::map<QString, std::vector<QString>> map { {QStringLiteral("QtMultimedia"), {QStringLiteral("mediaservice"), QStringLiteral("audio")}}, {QStringLiteral("Qt3DRender"), {QStringLiteral("sceneparsers"), QStringLiteral("geometryloaders")}}, |