summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2017-05-11 18:38:28 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2017-05-12 06:12:46 +0000
commitb1cce3258e0d6c474976a0f2d4f4a4cf32e5bfb2 (patch)
treec289dd6575c09b1a08924e21903c6ab5b247d000
parent26f0487bf5d02bd2a8e93406228087b3b5f4f673 (diff)
downloadqtlocation-b1cce3258e0d6c474976a0f2d4f4a4cf32e5bfb2.tar.gz
gypsy: fix initialization order warning
Warnings are fatal nowadays. In file included from qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp:40:0: qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h: In constructor ‘QGeoSatelliteInfoSourceGypsy::QGeoSatelliteInfoSourceGypsy(QObject*)’: qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h:136:12: error: ‘QGeoSatelliteInfoSourceGypsy::m_requestOngoing’ will be initialized after [-Werror=reorder] bool m_requestOngoing; ^~~~~~~~~~~~~~~~ qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h:134:14: error: ‘QTimer QGeoSatelliteInfoSourceGypsy::m_requestTimer’ [-Werror=reorder] QTimer m_requestTimer; ^~~~~~~~~~~~~~ qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp:143:1: error: when initialized here [-Werror=reorder] QGeoSatelliteInfoSourceGypsy::QGeoSatelliteInfoSourceGypsy(QObject *parent) : QGeoSatelliteInfoSource(parent), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I69b7923ce97a66baaee4e24b075e4d942e3e15f5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
-rw-r--r--src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp2
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()));