Merge pull request #14 from pvuorela/mer-stable

[qtbase] Add Mer specific theme hints back
[qtbase] Fix handling QT_IM_MODULE=none

Was added to allow no input context to be created with 19a39a4e.
Broken by commit 24c10b0b8d7.