Commit 5946a301 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧 Committed by Aleix Pol Gonzalez
Browse files

Do not set QT_IM_MODULE=qtvirtualkeyboard on wayland

On Wayland the virtual keyboard comes from the compositor.
parent 445fc8e4
......@@ -83,9 +83,11 @@ int main(int argc, char *argv[])
KLocalizedString::setApplicationDomain("kscreenlocker_greet");
// explicitly disable input methods as it makes it impossible to unlock, see BUG 306932
// explicitly disable input methods on x11 as it makes it impossible to unlock, see BUG 306932
// but explicitly set on screen keyboard such as maliit is allowed
if (!qEnvironmentVariableIsSet("QT_IM_MODULE") || (qEnvironmentVariableIsSet("QT_IM_MODULE") && qgetenv("QT_IM_MODULE") != QByteArrayLiteral("maliit"))) {
// on wayland, let the compositor take care of the input method
if (!qEnvironmentVariableIsSet("WAYLAND_DISPLAY") && !qEnvironmentVariableIsSet("WAYLAND_SOCKET")
&& qgetenv("QT_IM_MODULE") != QByteArrayLiteral("maliit")) {
qputenv("QT_IM_MODULE", QByteArrayLiteral("qtvirtualkeyboard"));
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment