summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-06-29 20:11:33 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-06-29 20:11:33 +0200
commit74963930da7984f170da515fa5022db6a7fa5830 (patch)
tree8561fa32c5cf62e4f59e4108f378f5e2fb6e6ac1
parent7a396992b19b440c236e3a8f483698fd0abee5e4 (diff)
parent09a5df3e9433138d54b0f44ba7ffcde8eb61e38b (diff)
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts: .qmake.conf Change-Id: I988cf7a720d4b17e875339e0ec75cad270fd6186
-rw-r--r--dist/changes-5.5.030
-rw-r--r--src/sensors/doc/src/qtsensors.qdoc2
2 files changed, 31 insertions, 1 deletions
diff --git a/dist/changes-5.5.0 b/dist/changes-5.5.0
new file mode 100644
index 00000000..543b4e85
--- /dev/null
+++ b/dist/changes-5.5.0
@@ -0,0 +1,30 @@
+Qt 5.5 introduces many new features and improvements as well as bugfixes
+over the 5.4.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+ http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.5 series is binary compatible with the 5.4.x series.
+Applications compiled for 5.4 will continue to run with 5.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - Removed BlackBerry Playbook support
+ - [QTBUG-45691] Fixed crash in Android Compass code
+ - Added iPhone6/6+ support to accelbubble example
+ - Fixed QNX 6.6 build
+ - [QTBUG-45516] Fixed restarting behavior of sensorfw
+
diff --git a/src/sensors/doc/src/qtsensors.qdoc b/src/sensors/doc/src/qtsensors.qdoc
index dcf571ab..348db67e 100644
--- a/src/sensors/doc/src/qtsensors.qdoc
+++ b/src/sensors/doc/src/qtsensors.qdoc
@@ -34,7 +34,7 @@
The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces.
The Qt Sensors API also provides a motion gesture recognition API for devices.
- Currently the API is supported on \l{Qt for Android}{Android}, \l{Qt for BlackBerry}{BlackBerry 10},
+ Currently the API is supported on \l{Qt for Android}{Android},
\l{Qt for iOS}{iOS}, \l{https://sailfishos.org}{SailFish} and \l{Qt for WinRT}{WinRT}.
\section1 Information for Application Writers