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

Proposed by Albert Astals Cid on 2014-01-23
Status: Merged
Approved by: Timo Jyrinki on 2014-01-23
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~aacid/qtubuntu-sensors/newvirtual
Merge into: lp:qtubuntu-sensors
Diff against target: 29 lines (+12/-0)
2 files modified
plugins/position/core_geo_position_info_source_factory.cpp (+9/-0)
plugins/position/core_geo_position_info_source_factory.h (+3/-0)
To merge this branch: bzr merge lp:~aacid/qtubuntu-sensors/newvirtual
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2014-01-23 Approve on 2014-01-23
Timo Jyrinki Approve on 2014-01-23
Review via email: mp+202811@code.launchpad.net

Commit message

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

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

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
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/position/core_geo_position_info_source_factory.cpp'
2--- plugins/position/core_geo_position_info_source_factory.cpp 2014-01-07 17:49:57 +0000
3+++ plugins/position/core_geo_position_info_source_factory.cpp 2014-01-23 09:32:07 +0000
4@@ -30,3 +30,12 @@
5 Q_UNUSED(parent);
6 return 0;
7 }
8+
9+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
10+QGeoAreaMonitorSource *core::GeoPositionInfoSourceFactory::areaMonitor(QObject *parent)
11+{
12+ Q_UNUSED(parent);
13+ return 0;
14+}
15+#endif
16+
17
18=== modified file 'plugins/position/core_geo_position_info_source_factory.h'
19--- plugins/position/core_geo_position_info_source_factory.h 2014-01-07 17:49:57 +0000
20+++ plugins/position/core_geo_position_info_source_factory.h 2014-01-23 09:32:07 +0000
21@@ -37,6 +37,9 @@
22 public:
23 QGeoPositionInfoSource *positionInfoSource(QObject *parent);
24 QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent);
25+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
26+ QGeoAreaMonitorSource *areaMonitor(QObject *parent);
27+#endif
28 };
29 }
30

Subscribers

People subscribed via source and target branches