This should fix LP#947156.
(cherry picked from commit f36c50b0)

Conflicts:
	modules/gui/qt4/dialogs/external.cpp