Merge some really, really minor changes from my experimental Qt. Re-order some build-deps/dev-package-deps (for neatness), and re-word a package description to avoid triggering a linda warning.
Changed paths: