Merge 82100 from /trunk
------------------------------------------------------------------------ r82100 | jhunold | 2012-12-19 17:22:55 +0100 (Mi, 19 Dez 2012) | 1 line
Disambiguate types created by Qt4 and Qt5 tools ------------------------------------------------------------------------