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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Timo Jyrinki
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 Approve
Timo Jyrinki Approve
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
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
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
30 Q_UNUSED(parent);30 Q_UNUSED(parent);
31 return 0;31 return 0;
32}32}
33
34#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
35QGeoAreaMonitorSource *core::GeoPositionInfoSourceFactory::areaMonitor(QObject *parent)
36{
37 Q_UNUSED(parent);
38 return 0;
39}
40#endif
41
3342
=== 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 @@
37public:37public:
38 QGeoPositionInfoSource *positionInfoSource(QObject *parent);38 QGeoPositionInfoSource *positionInfoSource(QObject *parent);
39 QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent);39 QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent);
40#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
41 QGeoAreaMonitorSource *areaMonitor(QObject *parent);
42#endif
40};43};
41}44}
4245

Subscribers

People subscribed via source and target branches