diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:40:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:40:48 +0100 |
| commit | c08e6e8d470ccbf6be845e7b6ce72158812ba623 (patch) | |
| tree | df88848ebbb2751bdbfaa18ca6d50b9ee9a0c38f | |
| parent | 0d56d37702b0c91578331321a7ccc1eccf20d773 (diff) | |
| parent | e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I97b86fef841d6dd8dbb04243b762bb6bc4980b63
| -rw-r--r-- | dist/changes-5.10.1 | 30 | ||||
| -rw-r--r-- | dist/changes-5.9.4 | 25 | ||||
| -rw-r--r-- | examples/sensors/sensorgestures/sensorgestures.pro | 1 |
3 files changed, 56 insertions, 0 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1 new file mode 100644 index 00000000..83b9840f --- /dev/null +++ b/dist/changes-5.10.1 @@ -0,0 +1,30 @@ +Qt 5.10.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.10.0. + +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.10 series is binary compatible with the 5.9.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +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. + +This release contains all fixes included in the Qt 5.9.4 release. + +**************************************************************************** +* Qt 5.10.1 Changes * +**************************************************************************** + +QtSensors +--------- + + - Fixed missing QML version bump. The QML import statement for QtSensors + was still 5.9. diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 00000000..10149376 --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,25 @@ +Qt 5.9.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +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.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.4 Changes * +**************************************************************************** + + - This release does not contain any changes to this module. + diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro index a60728e7..e692a53c 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/sensors/sensorgestures/sensorgestures.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = gesture QT += sensors widgets +requires(qtConfig(treewidget)) SOURCES += main.cpp\ mainwindow.cpp |