Make the QtAutomoc test compile with either Qt 4 or Qt 5
Add a test for Qt5Automoc

The same source is used as for the Qt4Automoc test.
Remove an endif() followed by an if() for the same condition.
Merge topic 'Automoc-Qt4-Qt5' into next

6489015 Remove an endif() followed by an if() for the same condition.
e7813b1 Add a test for Qt5Automoc
27fb96b Make the QtAutomoc test compile with either Qt 4 or Qt 5