Merge topic 'clarify-add_dependencies-error'

de13d68 add_dependencies: Distinguish target v. file dependencies in error (#14050)
Merge topic 'automoc-vs11-workaround'

20c99b1 automoc: Use a pre-build event in VS >= 7
Merge branch 'master' into next