diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:28 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:28 +0100 |
commit | 311a1d5dcacbf6d4d9e7da6a177de2fd0962eee9 (patch) | |
tree | 12c557ff3db7788f1b46b68855df3f1a6fb3e697 | |
parent | 096a9307596b319f73b05ff3f4b19e1cff4ed4ed (diff) | |
parent | be7e45ca259d70d5f2ef0d11460261146fc1df95 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I568a496e778bbefd7568a93174ae4e0e7f40dd02
-rw-r--r-- | dist/changes-5.10.1 | 26 | ||||
-rw-r--r-- | examples/datavisualization/bars/bars.pro | 2 | ||||
-rw-r--r-- | examples/datavisualization/custominput/custominput.pro | 1 | ||||
-rw-r--r-- | examples/datavisualization/itemmodel/itemmodel.pro | 1 | ||||
-rw-r--r-- | examples/datavisualization/scatter/scatter.pro | 2 | ||||
-rw-r--r-- | examples/datavisualization/surface/surface.pro | 1 |
6 files changed, 33 insertions, 0 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1 new file mode 100644 index 00000000..695c4e36 --- /dev/null +++ b/dist/changes-5.10.1 @@ -0,0 +1,26 @@ +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 * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/examples/datavisualization/bars/bars.pro b/examples/datavisualization/bars/bars.pro index ffb8b0ba..148fc66e 100644 --- a/examples/datavisualization/bars/bars.pro +++ b/examples/datavisualization/bars/bars.pro @@ -10,6 +10,8 @@ SOURCES += main.cpp graphmodifier.cpp HEADERS += graphmodifier.h QT += widgets +requires(qtConfig(fontcombobox)) +requires(qtConfig(combobox)) OTHER_FILES += doc/src/* \ doc/images/* diff --git a/examples/datavisualization/custominput/custominput.pro b/examples/datavisualization/custominput/custominput.pro index 0e11bfab..1fe1c57b 100644 --- a/examples/datavisualization/custominput/custominput.pro +++ b/examples/datavisualization/custominput/custominput.pro @@ -12,6 +12,7 @@ HEADERS += scatterdatamodifier.h \ custominputhandler.h QT += widgets +requires(qtConfig(combobox)) RESOURCES += custominput.qrc diff --git a/examples/datavisualization/itemmodel/itemmodel.pro b/examples/datavisualization/itemmodel/itemmodel.pro index 3249bb7b..60b36b98 100644 --- a/examples/datavisualization/itemmodel/itemmodel.pro +++ b/examples/datavisualization/itemmodel/itemmodel.pro @@ -9,6 +9,7 @@ android|ios|winrt { SOURCES += main.cpp QT += widgets +requires(qtConfig(tablewidget)) OTHER_FILES += doc/src/* \ doc/images/* diff --git a/examples/datavisualization/scatter/scatter.pro b/examples/datavisualization/scatter/scatter.pro index 1e98d637..b9f29f9c 100644 --- a/examples/datavisualization/scatter/scatter.pro +++ b/examples/datavisualization/scatter/scatter.pro @@ -10,6 +10,8 @@ SOURCES += main.cpp scatterdatamodifier.cpp HEADERS += scatterdatamodifier.h QT += widgets +requires(qtConfig(combobox)) +requires(qtConfig(fontcombobox)) OTHER_FILES += doc/src/* \ doc/images/* diff --git a/examples/datavisualization/surface/surface.pro b/examples/datavisualization/surface/surface.pro index 9daf2546..a49fa468 100644 --- a/examples/datavisualization/surface/surface.pro +++ b/examples/datavisualization/surface/surface.pro @@ -12,6 +12,7 @@ SOURCES += main.cpp \ HEADERS += surfacegraph.h QT += widgets +requires(qtConfig(combobox)) RESOURCES += surface.qrc |