diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 10:06:05 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 10:06:05 +0200 |
| commit | 4be378e568593debf4354f00d2fb04c44efb7b13 (patch) | |
| tree | 95ed5e5c61785143659735d31257504f0f8cae2d | |
| parent | cc2c52af79e773b8dc4bd430a8aa377ad0b297e5 (diff) | |
| parent | 457ab0a235ca9968c7ca6de95387ce63f3eda7cf (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into 1.0-integration
* '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors:
A new symbol was added to sensors.
| -rw-r--r-- | src/s60installs/bwins/QtSensorsu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtSensorsu.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtSensorsu.def b/src/s60installs/bwins/QtSensorsu.def index 3e860ae126..8ace9b20c7 100644 --- a/src/s60installs/bwins/QtSensorsu.def +++ b/src/s60installs/bwins/QtSensorsu.def @@ -353,4 +353,5 @@ EXPORTS ?type@QAmbientLightSensor@QtMobility@@2QBDB @ 352 NONAME ; char const * const QtMobility::QAmbientLightSensor::type
?type@QProximitySensor@QtMobility@@2QBDB @ 353 NONAME ; char const * const QtMobility::QProximitySensor::type
?type@QOrientationSensor@QtMobility@@2QBDB @ 354 NONAME ; char const * const QtMobility::QOrientationSensor::type
+ ?sensors_unit_test_hook@QtMobility@@YAXH@Z @ 355 NONAME ; void QtMobility::sensors_unit_test_hook(int)
diff --git a/src/s60installs/eabi/QtSensorsu.def b/src/s60installs/eabi/QtSensorsu.def index fa927fb336..e6f4cb627d 100644 --- a/src/s60installs/eabi/QtSensorsu.def +++ b/src/s60installs/eabi/QtSensorsu.def @@ -286,4 +286,5 @@ EXPORTS _ZTVN10QtMobility8QCompassE @ 285 NONAME
_ZN10QtMobility14QSensorReading14copyValuesFromEPS0_ @ 286 NONAME
_ZN10QtMobility14QSensorReadingC1EP7QObjectPNS_21QSensorReadingPrivateE @ 287 NONAME
+ _ZN10QtMobility22sensors_unit_test_hookEi @ 288 NONAME
|