Merge branch 'qdeclarativeview2' into harmattan