From d108e1f3548c4f63521b2ee065fa10461b464321 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 25 Jun 2019 18:02:47 +0200 Subject: [PATCH] AppFwk : Guard use of timestamp() function introduced in Qt5 --- Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp index 6121a5df91..9267547722 100644 --- a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp @@ -320,7 +320,10 @@ void caf::RotationSensitivityCalculator::init(QMouseEvent* eventAtRotationStart) { m_lastPosX = eventAtRotationStart->x(); m_lastPosY = eventAtRotationStart->y(); + +#if QT_VERSION >= 0x050000 m_lastTime = eventAtRotationStart->timestamp(); +#endif } //-------------------------------------------------------------------------------------------------- @@ -332,6 +335,7 @@ double caf::RotationSensitivityCalculator::calculateSensitivity(QMouseEvent* eve if ( m_isEnabled ) { +#if QT_VERSION >= 0x050000 auto presentTime = eventWhenRotating->timestamp(); unsigned long timeSinceLast = presentTime - m_lastTime; if ( timeSinceLast == 0 ) timeSinceLast = 1; // one millisecond @@ -356,6 +360,7 @@ double caf::RotationSensitivityCalculator::calculateSensitivity(QMouseEvent* eve //openDebugWindow(); //std::cout << sensitivity << " Speed: " << mouseVelocity.length() << " " << mouseVelocityLengthCorr << " \tDelta " << deltaX << ", " << deltaY << " "<< timeSinceLast << std::endl; +#endif } return sensitivity;