diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:31:00 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:31:00 +0100 |
commit | b2c5fcd3a0a878a39c5e861098e94f29c1ef6b2f (patch) | |
tree | cf23b09f65624203d809aae7e909f25cb4a061c7 /src/positioning/qgeopositioninfosourcefactory.cpp | |
parent | a425dd954b4319455fc29372ff2314e7dc81ee77 (diff) | |
parent | cd7edab940934fe8b100172e3e62e7eea5c354e5 (diff) | |
download | qtlocation-b2c5fcd3a0a878a39c5e861098e94f29c1ef6b2f.tar.gz |
Merge 5.14 into 5.14.0
Change-Id: Id2e7b0a3d3ecefdee377094fa10a1bea4a71d06c
Diffstat (limited to 'src/positioning/qgeopositioninfosourcefactory.cpp')
-rw-r--r-- | src/positioning/qgeopositioninfosourcefactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/positioning/qgeopositioninfosourcefactory.cpp b/src/positioning/qgeopositioninfosourcefactory.cpp index afb0a1d3..d9971c26 100644 --- a/src/positioning/qgeopositioninfosourcefactory.cpp +++ b/src/positioning/qgeopositioninfosourcefactory.cpp @@ -109,7 +109,7 @@ QGeoPositionInfoSourceFactory::~QGeoPositionInfoSourceFactory() \fn QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryV2::satelliteInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) Returns a new QGeoSatelliteInfoSource associated with this plugin - with parent \a parent., and using \a parameters as configuration parameters. + with parent \a parent, and using \a parameters as configuration parameters. Can also return 0, in which case the plugin loader will use the factory with the next highest priority. */ |