diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
commit | c043ebebaba80b32ddb69ed29aa3408549567a6d (patch) | |
tree | fb23afdccd8fd566d973ff3b3f95f30e8b24845e | |
parent | 38d0c7d930ce986e1406ce24894de4e4bced5387 (diff) | |
parent | be2cb77f0c882444d4d1080953b4d1b961973c0a (diff) |
Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1
Conflicts:
.qmake.conf
src/scxml/qscxmlcompiler.cpp
Change-Id: Ie338e2c6a09e2d885d5f57a80abd386065ac8bc8
-rw-r--r-- | dist/changes-5.10.0 | 27 | ||||
-rw-r--r-- | dist/changes-5.9.3 | 24 | ||||
-rw-r--r-- | dist/changes-5.9.4 | 25 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro | 1 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro | 1 | ||||
-rw-r--r-- | examples/scxml/sudoku/sudoku.pro | 1 | ||||
-rw-r--r-- | src/scxml/qscxmlcompiler.cpp | 2 |
7 files changed, 79 insertions, 2 deletions
diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0 new file mode 100644 index 0000000..7269d08 --- /dev/null +++ b/dist/changes-5.10.0 @@ -0,0 +1,27 @@ +Qt 5.10 introduces many new features and improvements as well as bugfixes +over the 5.9.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.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. + +**************************************************************************** +* Qt 5.10.0 Changes * +**************************************************************************** + +QtScxml +------- + + - Added Q_DECLARE_METATYPE declarations for various classes. + - Removed several dead code sections. + - Improved error handling for malformed documents. diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3 new file mode 100644 index 0000000..bb5db63 --- /dev/null +++ b/dist/changes-5.9.3 @@ -0,0 +1,24 @@ +Qt 5.9.3 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.3 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 0000000..d49a42f --- /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 contains only minor code improvements. + diff --git a/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro index 2a59c8d..eb2949a 100644 --- a/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro +++ b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.pro @@ -1,4 +1,5 @@ QT += widgets scxml +requires(qtConfig(listview)) CONFIG += c++11 diff --git a/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro index 89a7e4a..8ea0076 100644 --- a/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro +++ b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro @@ -1,4 +1,5 @@ QT += widgets scxml +requires(qtConfig(listview)) CONFIG += c++11 diff --git a/examples/scxml/sudoku/sudoku.pro b/examples/scxml/sudoku/sudoku.pro index 0853a5e..7eddc14 100644 --- a/examples/scxml/sudoku/sudoku.pro +++ b/examples/scxml/sudoku/sudoku.pro @@ -1,4 +1,5 @@ QT += widgets scxml +requires(qtConfig(combobox)) CONFIG += c++11 diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp index cc89ad1..61ad030 100644 --- a/src/scxml/qscxmlcompiler.cpp +++ b/src/scxml/qscxmlcompiler.cpp @@ -496,8 +496,6 @@ class DynamicStateMachine: public QScxmlStateMachine, public QScxmlInternal::Gen Q_DECLARE_PRIVATE(DynamicStateMachine) // Manually expanded from Q_OBJECT macro: public: - Q_OBJECT_CHECK - const QMetaObject *metaObject() const override { return d_func()->m_metaObject; } |