diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | examples/datavisualization/texturesurface/custominputhandler.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/input/q3dinputhandler.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 6 | ||||
| -rw-r--r-- | tests/manual/barstest/chart.cpp | 6 |
6 files changed, 13 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4da68cf4..de5c3ff9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,7 @@ load(qt_build_config) -MODULE_VERSION = 5.13.1 +DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +MODULE_VERSION = 5.14.0 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/examples/datavisualization/texturesurface/custominputhandler.cpp b/examples/datavisualization/texturesurface/custominputhandler.cpp index 07608c90..e8e693a0 100644 --- a/examples/datavisualization/texturesurface/custominputhandler.cpp +++ b/examples/datavisualization/texturesurface/custominputhandler.cpp @@ -58,7 +58,7 @@ void CustomInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mouse //! [1] void CustomInputHandler::wheelEvent(QWheelEvent *event) { - float delta = float(event->delta()); + float delta = float(event->angleDelta().y()); m_axisXMinValue += delta; m_axisXMaxValue -= delta; diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 56b7a45e..97ea2bf5 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -48,7 +48,7 @@ #include "q3dscene_p.h" #include "qcustom3ditem.h" #include <QtGui/QLinearGradient> -#include <QtCore/QTime> +#include <QtCore/QElapsedTimer> #include <QtCore/QLocale> #include <QtCore/QMutex> @@ -211,7 +211,7 @@ protected: QList<QAbstract3DSeries *> m_seriesList; bool m_measureFps; - QTime m_frameTimer; + QElapsedTimer m_frameTimer; int m_numFrames; qreal m_currentFps; diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 5e6f10af..3d5dd059 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -262,7 +262,7 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) zoomLevel = qBound(minZoomLevel, zoomLevel, maxZoomLevel); if (isZoomAtTargetEnabled()) { - scene()->setGraphPositionQuery(event->pos()); + scene()->setGraphPositionQuery(event->position().toPoint()); d_ptr->m_zoomAtTargetPending = true; // If zoom at target is enabled, we don't want to zoom yet, as that causes // jitter. Instead, we zoom next frame, when we apply the camera position. diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index d5850d86..e80058db 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -265,11 +265,11 @@ QString Utils::formatLabelSprintf(const QByteArray &format, Utils::ParamType par { switch (paramType) { case ParamTypeInt: - return QString().sprintf(format, (qint64)value); + return QString::asprintf(format.constData(), qint64(value)); case ParamTypeUInt: - return QString().sprintf(format, (quint64)value); + return QString::asprintf(format.constData(), quint64(value)); case ParamTypeReal: - return QString().sprintf(format, value); + return QString::asprintf(format.constData(), value); default: // Return format string to detect errors. Bars selection label logic also depends on this. return QString::fromUtf8(format); diff --git a/tests/manual/barstest/chart.cpp b/tests/manual/barstest/chart.cpp index 528b32a5..2cc52ecf 100644 --- a/tests/manual/barstest/chart.cpp +++ b/tests/manual/barstest/chart.cpp @@ -39,7 +39,7 @@ #include <QtDataVisualization/q3dinputhandler.h> #include <QtDataVisualization/qcustom3ditem.h> #include <QtCore/QRandomGenerator> -#include <QtCore/QTime> +#include <QtCore/QElapsedTimer> #include <QtCore/qmath.h> using namespace QtDataVisualization; @@ -354,7 +354,7 @@ void GraphModifier::flipViews() void GraphModifier::createMassiveArray() { const int arrayDimension = 1000; - QTime timer; + QElapsedTimer timer; timer.start(); QStringList genericColumnLabels; @@ -495,7 +495,7 @@ void GraphModifier::insertRow() void GraphModifier::insertRows() { - QTime timer; + QElapsedTimer timer; timer.start(); QBarDataArray dataArray; QStringList labels; |