This reverts commit 1463e7cb.

Conflicts:

	modules/gui/qt4/components/controller.cpp
	modules/gui/qt4/components/controller_widget.hpp