summaryrefslogtreecommitdiff
path: root/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-01-21 12:25:05 +0100
committerIvan Solovev <ivan.solovev@qt.io>2021-01-22 14:32:03 +0100
commit8f25a043dae764bb7def1f67ea49595d74eeb1d0 (patch)
tree858d18240ed83edecd9a62b96b78cca1f1700cb5 /src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
parentb45ee37f5587f9193c8c03bba580334fbf0d9d42 (diff)
downloadqtlocation-8f25a043dae764bb7def1f67ea49595d74eeb1d0.tar.gz
QtPositioning: get rid of warnings
Fix warnings in QtPositioning sources. These are mostly the warnings regarding a missing "override" keyword in unit tests. Task-number: QTBUG-90491 Change-Id: I6ca676de0733767d4b85353670103ad5a8d60688 Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp')
-rw-r--r--src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
index 1694fd30..2a3f31dc 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
@@ -218,7 +218,9 @@ int QGeoSatelliteInfoSourceGypsy::init()
GConfClient *client;
gchar *device_name;
- g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+ g_type_init (); // this function was deprecated in glib 2.36
+#endif
createEngine();
client = m_engine->eng_gconf_client_get_default();