1 files changed, 2 insertions, 25 deletions
diff --git a/src/imports/sensors2/qsensor2proximity.cpp b/src/imports/sensors2/qsensor2proximity.cpp
index 4322ad7c..14b0e599 100644
--- a/src/imports/sensors2/qsensor2proximity.cpp
+++ b/src/imports/sensors2/qsensor2proximity.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass ProximitySensor QSensor2Proximity
+    \inherits QtSensors5::Sensor
     \inqmlmodule QtSensors 5
     \ingroup qml-QtSensors5
     \since QtSensors 5.0
@@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QSensor2Proximity::QSensor2Proximity(QObject* parent)
-    : QObject(parent)
+    : qsensor2common(parent)
     , _near(false)
 {
     _proximity = new QProximitySensor(this);
@@ -67,30 +68,6 @@ QSensor2Proximity::~QSensor2Proximity()
 }
 
 /*!
-    \qmlproperty bool QtSensors5::ProximitySensor::enabled
-    This property can be used to activate or deactivate the sensor.
-*/
-bool QSensor2Proximity::enabled()
-{
-    return _proximity->isActive();
-}
-
-void QSensor2Proximity::setEnabled(bool val)
-{
-    bool active = enabled();
-    if (active != val){
-        if (val){
-            bool ret = _proximity->start();
-            if (!ret)
-                qWarning() << "couldn't start the sensor.";
-        }
-        else
-            _proximity->stop();
-        emit enabledChanged();
-    }
-}
-
-/*!
     \qmlproperty bool QtSensors5::ProximitySensor::near
     This property holds whether the sensor has detected something in close proximity.
     Device dependent, but typically 1-2 cm.