Merge pull request #11 from amccarthy/master

[update] Cherry-picks of commits from upstream dev branch.
[packaging] Cherry-picked commits from upstream.

09d8821 Fix potential enum value clashes in QGeoPositionInfoSource::Error.
b7a585e Don't start Geoclue providers until necessary.