Keyboard: Correctly read the xkb locked state

Fixes a typo when reading the xkb states

Change-Id: Ie5acdbcff188049683b503ba8fc8f58c693eb102
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Null check for window on pointer_axis

The window is already destroyed and server doesn't get a message yet.

Change-Id: Ia9dd0ce891a712d1aa913fcb3313a5fe300788ab
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
build fix for MODULE_PLUGINS_TYPE

Change-Id: I8d44f50480440060eba84354e88fb2535e1d8e4a
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

also amended the libhybris plugin according to the merged change.

Change-Id: I2987043cf21936aa0f221343d00dacdc574be06a