diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
| commit | f55629245259ba7364e258f92408823024423caa (patch) | |
| tree | f73063cf02dc175fbe9f0bfb48b3ddd686ea0f72 /src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp | |
| parent | 22d980c8124026eb712f563326d5a5c1b180c671 (diff) | |
| parent | d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 (diff) | |
| download | qtlocation-f55629245259ba7364e258f92408823024423caa.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/plugins/geoservices/geoservices.pro
Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
Diffstat (limited to 'src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp')
| -rw-r--r-- | src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp index c3152014..1694fd30 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp @@ -141,7 +141,7 @@ gchar *SatelliteGypsyEngine::eng_gconf_client_get_string(GConfClient *client, co } QGeoSatelliteInfoSourceGypsy::QGeoSatelliteInfoSourceGypsy(QObject *parent) : QGeoSatelliteInfoSource(parent), - m_engine(0), m_satellite(0), m_device(0), m_updatesOngoing(false), m_requestOngoing(false), m_requestTimer(this) + m_engine(0), m_satellite(0), m_device(0), m_requestTimer(this), m_updatesOngoing(false), m_requestOngoing(false) { m_requestTimer.setSingleShot(true); QObject::connect(&m_requestTimer, SIGNAL(timeout()), this, SLOT(requestUpdateTimeout())); |