use Q_WS_X11
Merge pull request #168 from Chilledheart/patch-2

use Q_WS_X11
Merge branch '3.1'