diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
| commit | 980567b3a32b2e2f00c86f2d627cd82b5230dd0f (patch) | |
| tree | bc8cc4005b2e07cbc5cad8ba30f8c9fa4f236c3d /src/plugins/platforms/eglfs/api/qeglfsintegration.cpp | |
| parent | e81acde7d0cf5fb44a3fb2cf0bf7aaa2c65f807e (diff) | |
| parent | 730cbad8824bcfcb7ab60371a6563cfb6dd5658d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/android/templates/AndroidManifest.xml
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9
Diffstat (limited to 'src/plugins/platforms/eglfs/api/qeglfsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsintegration.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 72420199e3d..8ccb0ef2cd0 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -429,6 +429,8 @@ QFunctionPointer QEglFSIntegration::platformFunction(const QByteArray &function) #if QT_CONFIG(evdev) if (function == QEglFSFunctions::loadKeymapTypeIdentifier()) return QFunctionPointer(loadKeymapStatic); + else if (function == QEglFSFunctions::switchLangTypeIdentifier()) + return QFunctionPointer(switchLangStatic); #endif return qt_egl_device_integration()->platformFunction(function); @@ -447,6 +449,17 @@ void QEglFSIntegration::loadKeymapStatic(const QString &filename) #endif } +void QEglFSIntegration::switchLangStatic() +{ +#if QT_CONFIG(evdev) + QEglFSIntegration *self = static_cast<QEglFSIntegration *>(QGuiApplicationPrivate::platformIntegration()); + if (self->m_kbdMgr) + self->m_kbdMgr->switchLang(); + else + qWarning("QEglFSIntegration: Cannot switch language, no keyboard handler found"); +#endif +} + void QEglFSIntegration::createInputHandlers() { #if QT_CONFIG(libinput) |