Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtSensors
Commits
50c16eab
Commit
50c16eab
authored
12 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa
parents
d2cafb85
879e5536
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
old/5.1
old/5.2
stable
wip/cmake
wip/tizen
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
No related merge requests found
Changes
189
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+1
-0
.gitignore
.qmake.conf
+2
-0
.qmake.conf
config.tests/bbsensor_holster/bbsensor_holster.pro
+4
-0
config.tests/bbsensor_holster/bbsensor_holster.pro
config.tests/bbsensor_holster/main.cpp
+57
-0
config.tests/bbsensor_holster/main.cpp
doc/config/qt-cpp-ignore.qdocconf
+0
-2
doc/config/qt-cpp-ignore.qdocconf
qtsensors.pro
+1
-0
qtsensors.pro
src/imports/sensors/plugins.qmltypes
+150
-31
src/imports/sensors/plugins.qmltypes
src/imports/sensors/qmlaccelerometer.cpp
+21
-0
src/imports/sensors/qmlaccelerometer.cpp
src/imports/sensors/qmlaccelerometer.h
+15
-2
src/imports/sensors/qmlaccelerometer.h
src/imports/sensors/qmlaltimeter.cpp
+133
-0
src/imports/sensors/qmlaltimeter.cpp
src/imports/sensors/qmlaltimeter.h
+86
-0
src/imports/sensors/qmlaltimeter.h
src/imports/sensors/qmlambientlightsensor.h
+0
-2
src/imports/sensors/qmlambientlightsensor.h
src/imports/sensors/qmlambienttemperaturesensor.cpp
+133
-0
src/imports/sensors/qmlambienttemperaturesensor.cpp
src/imports/sensors/qmlambienttemperaturesensor.h
+86
-0
src/imports/sensors/qmlambienttemperaturesensor.h
src/imports/sensors/qmlcompass.h
+0
-2
src/imports/sensors/qmlcompass.h
src/imports/sensors/qmlgyroscope.h
+0
-2
src/imports/sensors/qmlgyroscope.h
src/imports/sensors/qmlholstersensor.cpp
+133
-0
src/imports/sensors/qmlholstersensor.cpp
src/imports/sensors/qmlholstersensor.h
+86
-0
src/imports/sensors/qmlholstersensor.h
src/imports/sensors/qmlirproximitysensor.h
+0
-2
src/imports/sensors/qmlirproximitysensor.h
src/imports/sensors/qmllightsensor.cpp
+3
-7
src/imports/sensors/qmllightsensor.cpp
with
911 additions
and
50 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets