This reverts commit ec468212.

Conflicts:

	modules/gui/qt4/qt4.cpp
	modules/video_output/msw/events_vo.c
	modules/video_output/x11/xcommon.c
	modules/video_output/xcb/common.c
	modules/video_output/xcb/window.c
	src/video_output/window.c