summaryrefslogtreecommitdiffstats
path: root/src/datavisualization
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h4
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp2
-rw-r--r--src/datavisualization/utils/utils.cpp6
3 files changed, 6 insertions, 6 deletions
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);