diff options
author | Andy Shaw <andy.shaw@qt.io> | 2019-01-15 10:08:17 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2019-02-27 13:01:29 +0000 |
commit | b4597180191734ca128772d2b8547c6e6c08efa2 (patch) | |
tree | d2e99d32edfbd6e485536689b0e75c57c38ba92e /src/macdeployqt | |
parent | 6c8d836335a0eb57c76aee78b700893ca014fc90 (diff) |
macdeployqt: Deploy the platforminputcontext plugins and vkb plugins
When the gui module is used then the platforminputcontext plugins should
be deployed. Additionally if that includes the virtualkeyboard plugin
then those should also be deployed with it.
Change-Id: I2787792e91a9cfe3603a4e2e29273f682942bf36
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/macdeployqt')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 66b4c588f..25577b255 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1096,6 +1096,16 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl addPlugins(QStringLiteral("iconengines")); + // Platforminputcontext plugins if QtGui is in use + if (deploymentInfo.containsModule("Gui", libInfix)) { + addPlugins(QStringLiteral("platforminputcontexts"), [&addPlugins](const QString &lib) { + // Deploy the virtual keyboard plugins if we have deployed virtualkeyboard + if (lib.startsWith(QStringLiteral("libqtvirtualkeyboard"))) + addPlugins(QStringLiteral("virtualkeyboard")); + return true; + }); + } + // Sql plugins if QtSql is in use if (deploymentInfo.containsModule("Sql", libInfix)) { addPlugins(QStringLiteral("sqldrivers"), [](const QString &lib) { |