Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa

1 files changed, 9 insertions, 1 deletions

diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index 210ceac..2236ce1 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = sensors
 TARGET  = declarative_sensors
 TARGETPATH = QtSensors
-IMPORT_VERSION = 5.0 # Doesn't matter, as long as it's a valid version?!
+IMPORT_VERSION = 5.1 # Doesn't matter, as long as it's a valid version?!
 
 QT += qml sensors sensors-private
 
@@ -9,13 +9,17 @@ HEADERS += \
     qmlsensor.h \
     qmlsensorrange.h \
     qmlaccelerometer.h \
+    qmlaltimeter.h \
     qmlambientlightsensor.h \
+    qmlambienttemperaturesensor.h \
     qmlcompass.h \
     qmlgyroscope.h \
+    qmlholstersensor.h \
     qmlirproximitysensor.h \
     qmllightsensor.h \
     qmlmagnetometer.h \
     qmlorientationsensor.h \
+    qmlpressuresensor.h\
     qmlproximitysensor.h \
     qmltapsensor.h \
     qmlrotationsensor.h \
@@ -27,13 +31,17 @@ SOURCES += sensors.cpp \
     qmlsensor.cpp \
     qmlsensorrange.cpp \
     qmlaccelerometer.cpp \
+    qmlaltimeter.cpp \
     qmlambientlightsensor.cpp \
+    qmlambienttemperaturesensor.cpp \
     qmlcompass.cpp \
     qmlgyroscope.cpp \
+    qmlholstersensor.cpp \
     qmlirproximitysensor.cpp \
     qmllightsensor.cpp \
     qmlmagnetometer.cpp \
     qmlorientationsensor.cpp \
+    qmlpressuresensor.cpp\
     qmlproximitysensor.cpp \
     qmltapsensor.cpp \
     qmlrotationsensor.cpp \