summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-02 12:23:06 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-02 12:23:06 +0100
commit5efb14517ac1f7c97c69924e2e42cab1f7997f9f (patch)
treec7935687cb237a3eb88352155a9c0e0499bd4aed
parentb932739133ad8276b0e60ee35c318afddc367091 (diff)
parent649396eba96770b211ba2fc3053c53249220ca24 (diff)
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts: .qmake.conf Change-Id: I58c54028067aa0be09ec6542e9b7154396b08d0f
-rw-r--r--dist/changes-5.4.048
-rw-r--r--doc/config/qt-html-templates-online.qdocconf2
-rw-r--r--examples/sensors/grue/import/main.cpp4
-rw-r--r--src/plugins/sensors/sensors.pro6
4 files changed, 56 insertions, 4 deletions
diff --git a/dist/changes-5.4.0 b/dist/changes-5.4.0
new file mode 100644
index 00000000..65270bb6
--- /dev/null
+++ b/dist/changes-5.4.0
@@ -0,0 +1,48 @@
+Qt 5.4 introduces many new features and improvements as well as bugfixes
+over the 5.3.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.4
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - QDistanceSensor class added.
+ * Currently only implemented on BlackBerry.
+
+ - Some minor documentation fixes added.
+
+ - [QTBUG-31076] Maze example improved.
+
+ - [QTBUG-31076] Cube example removed.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Android
+-------
+
+ - Compass sensor implementation added.
+
+WinRT
+-----
+
+ - Ambient light and orientation sensor implementation added.
+ - [QTBUG-40664] Data rates for all sensors set to 1Hz.
+ - Fixed crash due to divide by zero.
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index ac1ea9c0..d08c27e0 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -119,7 +119,7 @@ HTML.footer = \
" <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
" <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
" <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
- " requests, please use the <a href=\"http://bugreports.qt-project.org/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+ " requests, please use the <a href=\"http://bugreports.qt.io/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
" <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
" <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
" </form>\n" \
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index 4191d623..c6e80ef5 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -114,7 +114,7 @@ QT_END_NAMESPACE
\qmltype GrueSensor
\instantiates GrueSensor
\inherits Sensor
- \inqmlmodule Grue 1.0
+ \inqmlmodule Grue
\brief The GrueSensor type reports on your chance of being eaten by a Grue.
The GrueSensor type reports on your chance of being eaten by a Grue.
@@ -129,7 +129,7 @@ QT_END_NAMESPACE
\qmltype GrueSensorReading
\instantiates GrueSensorReading
\inherits SensorReading
- \inqmlmodule Grue 1.0
+ \inqmlmodule Grue
\brief The GrueSensorReading type holds the most recent GrueSensor reading.
The GrueSensorReading type holds the most recent GrueSensor reading.
diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro
index 3f35db5a..a66ed4a8 100644
--- a/src/plugins/sensors/sensors.pro
+++ b/src/plugins/sensors/sensors.pro
@@ -24,7 +24,11 @@ qtHaveModule(simulator) {
isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = simulator generic
}
-isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy
+linux {
+ isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = linux generic
+}
+
+contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, generic):SUBDIRS += generic
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, simulator):qtHaveModule(simulator):SUBDIRS += simulator
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, blackberry):blackberry:SUBDIRS += blackberry