Name clashes with things defined in X11 headers when building with LSB compilers

When building Qt with LSB compilers and using the latest LSB 4.1 beta packages, the GTK module gets enabled for building. This in turn triggers a number of problems associated with name clashes between Qt types/enums and things defined in the X11/X.h header. The Qt headers try to handle this in some places, but these measures are not enough to avoid compiler errors. At a minimum, the following files are affected:

src/corelib/io/qurl.h
src/corelib/io/qtextstream.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qt_x11_p.h

I've attached a patch for these files which addresses the issues I've found so far. Note that this patch also includes the fix mentioned in QTBUG-16404.