Merge lp:~ricmm/qtubuntu-sensors/browser-location-vivid into lp:qtubuntu-sensors

[Ricardo Mendoza]

Connect to application state signals directly and explicitly by registering the meta type in case we dont live on the UI thread. Fix #1402994.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-vivid-i386-ci/4

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Works fine and it finally stops location updates after moving removing the focus from the webapp.

review: Approve

=== modified file 'plugins/position/CMakeLists.txt'
--- plugins/position/CMakeLists.txt	2014-01-10 16:51:27 +0000
+++ plugins/position/CMakeLists.txt	2015-02-26 19:26:34 +0000
@@ -1,6 +1,7 @@
 find_package(PkgConfig)
 
 find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
 find_package(Qt5Location REQUIRED)
 
 pkg_check_modules(UBUNTU_PLATFORM_API ubuntu-platform-api REQUIRED)
@@ -26,14 +27,16 @@
 
 message(STATUS "Installing Qt5 location plugin to: ${PLUGIN_INSTALL_LOCATION}")
 
-qt5_use_modules(qtposition_ubuntu Core Location)
+qt5_use_modules(qtposition_ubuntu Core Gui Location)
+qt5_use_modules(qtposition_ubuntu Gui Location)
 
 target_link_libraries(
   qtposition_ubuntu
 
   ${CMAKE_THREAD_LIBS_INIT}
 
-  Qt5::Core 
+  Qt5::Core
+  Qt5::Gui
   Qt5::Location
 
   ${UBUNTU_PLATFORM_API_LIBRARIES}

=== modified file 'plugins/position/core_geo_position_info_source.cpp'
--- plugins/position/core_geo_position_info_source.cpp	2015-02-18 18:41:17 +0000
+++ plugins/position/core_geo_position_info_source.cpp	2015-02-26 19:26:34 +0000
@@ -20,8 +20,8 @@
 
 #include <cmath>
 
+#include <QGuiApplication>
 #include <QtCore>
-#include <QCoreApplication>
 
 #include <ubuntu/application/location/service.h>
 #include <ubuntu/application/location/session.h>
@@ -94,13 +94,14 @@
     QObject::connect(&d->timer, SIGNAL(timeout()), this, SLOT(timeout()), Qt::DirectConnection);
     // Whenever we receive an update, we stop the timeout timer immediately.
     QObject::connect(this, SIGNAL(positionUpdated(const QGeoPositionInfo&)), &d->timer, SLOT(stop()));
-    
-    QCoreApplication::instance()->installEventFilter(this);
+    QObject::connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(applicationStateChanged()));
+    qRegisterMetaType<Qt::ApplicationState>("Qt::ApplicationState");
 }
 
-bool core::GeoPositionInfoSource::eventFilter(QObject *obj, QEvent *event)
+void core::GeoPositionInfoSource::applicationStateChanged()
 {
-    if (event->type() == QEvent::ApplicationDeactivate) {
+    Qt::ApplicationState state = qApp->applicationState();
+    if (state == Qt::ApplicationInactive) {
         if (m_applicationActive) {
             int state = m_state;
             stopUpdates();
@@ -119,7 +120,7 @@
             }
         }
     }
-    else if (event->type() == QEvent::ApplicationActivate) {
+    else if (state == Qt::ApplicationActive) {
         if (!m_applicationActive) {
             m_applicationActive = true;
 
@@ -134,8 +135,6 @@
             }
         }
     }
-
-    return QObject::eventFilter(obj, event);
 }
 
 

=== modified file 'plugins/position/core_geo_position_info_source.h'
--- plugins/position/core_geo_position_info_source.h	2015-02-13 15:35:54 +0000
+++ plugins/position/core_geo_position_info_source.h	2015-02-26 19:26:34 +0000
@@ -30,8 +30,6 @@
     GeoPositionInfoSource(QObject *parent = 0);
     ~GeoPositionInfoSource();
 
-    bool eventFilter(QObject *obj, QEvent *event);
-
     // From QGeoPositionInfoSource
     void setUpdateInterval(int msec);
     QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const;
@@ -49,6 +47,7 @@
     };
 
 public slots:
+    void applicationStateChanged();
     virtual void startUpdates();
     virtual void stopUpdates();
     virtual void requestUpdate(int timeout = 5000);