[nox11] backport of https://qt.gitorious.org/qt/qtwayland/commit/10700eb19191879caf41bc188dca807b68a4146c
Merge pull request #42 from mer-packages/fix-xkb

[nox11] backport of https://qt.gitorious.org/qt/qtwayland/commit/10700eb...