Merge lp:~aacid/qtubuntu-sensors/newvirtual into lp:qtubuntu-sensors

[Albert Astals Cid]

Make it compile with Qt 5.2 (LP: #1271415)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/31/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

It fixes the build issue, while not touch functionality with Qt 5.0 at all. Good to go in, although next up are some test failures which can have a new bug number.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/position/core_geo_position_info_source_factory.cpp'
--- plugins/position/core_geo_position_info_source_factory.cpp	2014-01-07 17:49:57 +0000
+++ plugins/position/core_geo_position_info_source_factory.cpp	2014-01-23 09:32:07 +0000
@@ -30,3 +30,12 @@
     Q_UNUSED(parent);
     return 0;
 }
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+QGeoAreaMonitorSource *core::GeoPositionInfoSourceFactory::areaMonitor(QObject *parent)
+{
+    Q_UNUSED(parent);
+    return 0;
+}
+#endif
+

=== modified file 'plugins/position/core_geo_position_info_source_factory.h'
--- plugins/position/core_geo_position_info_source_factory.h	2014-01-07 17:49:57 +0000
+++ plugins/position/core_geo_position_info_source_factory.h	2014-01-23 09:32:07 +0000
@@ -37,6 +37,9 @@
 public:
     QGeoPositionInfoSource *positionInfoSource(QObject *parent);
     QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+    QGeoAreaMonitorSource *areaMonitor(QObject *parent);
+#endif
 };
 }