Fix assert after makerope boundary check

The browser demo asserts on qt-project.org after the makerope security
fix.

Port of http://trac.webkit.org/changeset/169397

Change-Id: I19c98737735d9b17133742752928d4ce6349de13
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
avoid creation of empty qmltypes for qtquick1

Change-Id: Ic28043a94151d3878219e5808075ce6ae663c316
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I11f35f205d2ded597d54650a948bec3e1e52b419
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4