diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:44 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:44 +0300 |
commit | 8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d (patch) | |
tree | 4190fd500e053d0d8cf6147117b0f3ed37513309 | |
parent | 502612c72a2cd3b3b0c4cff926e7764d74106d33 (diff) | |
parent | d417c34a55c04bc33e2f3d3ef8bbe2bd3e17b971 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: Id68024f741ef930d449828483ccb749230ee8278
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index 315085e5..f537d2ce 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.6 +MODULE_VERSION = 5.15.7 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 284ab408..20460bba 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -656,11 +656,6 @@ qreal QAbstract3DGraph::currentFps() const * * \brief Whether orthographic projection is used for displaying the graph. * - * If \c {true}, ortographic projection is used to create 2D graphs by replacing - * the default input handler with one that does not allow rotating the graph and - * by setting the camera to view the graph - * directly from the side or from the top. Also, axis labels typically need to be rotated when - * viewing the graph from the sides. * Defaults to \c{false}. * \note Shadows will be disabled when set to \c{true}. * |