[qtdeclarative] Revive previous revert and fix startup problems.