diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:04:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:04:47 +0100 |
| commit | 6f6a4a574ebc61f8e341e681e63b5a2f66156ce2 (patch) | |
| tree | 4fbe689d8faf37c348a4c9a6fa6274f57a8162df | |
| parent | 32f5237cd79385681481ba37ecf7f0bcfaa5ab96 (diff) | |
| parent | b4597180191734ca128772d2b8547c6e6c08efa2 (diff) | |
| download | qttools-6f6a4a574ebc61f8e341e681e63b5a2f66156ce2.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id06ccca252abc84720b18909f55019266426eb97
| -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 aefbc3765..3abc31c72 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1097,6 +1097,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) { |