Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib061722a7ebc4b26bf132c67a005910f2d39400f

3 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/position/android/src/jnipositioning.cpp b/src/plugins/position/android/src/jnipositioning.cpp
index 6b49b9fe..afae1c8e 100644
--- a/src/plugins/position/android/src/jnipositioning.cpp
+++ b/src/plugins/position/android/src/jnipositioning.cpp
@@ -167,7 +167,9 @@ namespace AndroidPositioning {
                 __android_log_print(ANDROID_LOG_INFO, logTag, "Unknown positioningMethod");
             }
         }
+
         env.jniEnv->ReleaseIntArrayElements(jProviders, providers, 0);
+        env.jniEnv->DeleteLocalRef(jProviders);
 
         return ret;
     }
@@ -261,6 +263,7 @@ namespace AndroidPositioning {
             info.setAttribute(QGeoPositionInfo::Direction, bearing);
         }
 
+        jniEnv->DeleteLocalRef(thisClass);
         return info;
     }
 
@@ -340,7 +343,10 @@ namespace AndroidPositioning {
         if (location == 0)
             return QGeoPositionInfo();
 
-        return positionInfoFromJavaLocation(env.jniEnv, location);
+        const QGeoPositionInfo info = positionInfoFromJavaLocation(env.jniEnv, location);
+        env.jniEnv->DeleteLocalRef(location);
+
+        return info;
     }
 
     inline int positioningMethodToInt(QGeoPositionInfoSource::PositioningMethods m)
diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
index 207b949b..0e2f9a5d 100644
--- a/src/plugins/position/position.pro
+++ b/src/plugins/position/position.pro
@@ -2,10 +2,10 @@ TEMPLATE = subdirs
 
 config_geoclue:SUBDIRS += geoclue
 config_gypsy:SUBDIRS += gypsy
-simulator:SUBDIRS += simulator
+qtHaveModule(simulator):SUBDIRS += simulator
 blackberry:SUBDIRS += blackberry
 ios:SUBDIRS += corelocation
-android:SUBDIRS += android
+android:!android-no-sdk:SUBDIRS += android
 
 SUBDIRS += \
     positionpoll
diff --git a/src/plugins/position/simulator/qlocationconnection_simulator.cpp b/src/plugins/position/simulator/qlocationconnection_simulator.cpp
index b78eb1cf..02ccad7a 100644
--- a/src/plugins/position/simulator/qlocationconnection_simulator.cpp
+++ b/src/plugins/position/simulator/qlocationconnection_simulator.cpp
@@ -73,11 +73,6 @@ namespace Simulator
 
         // register for location notifications
         mWorker->call("setRequestsLocationInfo");
-
-        // wait until initial data is received
-        QEventLoop loop;
-        connect(this, SIGNAL(initialDataReceived()), &loop, SLOT(quit()));
-        loop.exec();
     }
 
     LocationConnection::~LocationConnection()