4 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp
index 5a42d0cb..76aa0278 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.cpp
+++ b/src/plugins/sensors/android/src/androidaccelerometer.cpp
@@ -89,8 +89,8 @@ AndroidSensors::AndroidSensorType AndroidAccelerometer::modeToSensor(QAccelerome
     case QAccelerometer::User:
         type = AndroidSensors::TYPE_LINEAR_ACCELERATION;
         break;
-    default:
     case QAccelerometer::Combined:
+    default:
         type = AndroidSensors::TYPE_ACCELEROMETER;
         break;
     }
diff --git a/src/plugins/sensors/android/src/main.cpp b/src/plugins/sensors/android/src/main.cpp
index 3326208b..3d8604fe 100644
--- a/src/plugins/sensors/android/src/main.cpp
+++ b/src/plugins/sensors/android/src/main.cpp
@@ -112,10 +112,11 @@ public:
     {
         AndroidSensorType type = static_cast<AndroidSensorType>(sensor->identifier().toInt());
         switch (type) {
-        case TYPE_ACCELEROMETER:
-        {
+        case TYPE_ACCELEROMETER: {
             QAccelerometer * const accelerometer = qobject_cast<QAccelerometer *>(sensor);
-            AndroidSensors::AndroidSensorType type = AndroidAccelerometer::modeToSensor(accelerometer->accelerationMode());
+            AndroidSensors::AndroidSensorType type
+             = accelerometer ? AndroidAccelerometer::modeToSensor(accelerometer->accelerationMode())
+             : AndroidSensors::TYPE_ACCELEROMETER;
             return new AndroidAccelerometer(type, sensor);
         }
         case TYPE_AMBIENT_TEMPERATURE:
diff --git a/src/plugins/sensors/android/src/plugin.json b/src/plugins/sensors/android/src/plugin.json
index 8a55b3ae..ef0cbb62 100644
--- a/src/plugins/sensors/android/src/plugin.json
+++ b/src/plugins/sensors/android/src/plugin.json
@@ -1 +1 @@
-{ "Keys": [ "notused" ] }
+{ "Keys": [ "android" ] }
diff --git a/src/plugins/sensors/android/src/src.pro b/src/plugins/sensors/android/src/src.pro
index a184aae7..21423efb 100644
--- a/src/plugins/sensors/android/src/src.pro
+++ b/src/plugins/sensors/android/src/src.pro
@@ -2,6 +2,7 @@ TARGET = qtsensors_android
 QT = sensors core
 
 PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = QCounterGesturePlugin
 load(qt_plugin)
 
 # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp