(cherry picked from commit 6e4f7493b073e405a03e977adb52085924740fd5)

Conflicts:

	modules/gui/qt4/dialogs_provider.cpp