From 3f05e05721057b828781a4001d5ea08bcfc3f662 Mon Sep 17 00:00:00 2001 From: cwabbott Date: Tue, 1 Feb 2011 14:57:39 +0000 Subject: [PATCH] Scope plugin: make compatible for Qt 4.6. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2670 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp index bb1df2f14..b667930e1 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp @@ -530,7 +530,11 @@ int ScopeGadgetWidget::csvLoggingInsertData() else { QTextStream ss( &tempString ); +#if QT_VERSION >= 0x040700 ss << NOW.toString("yyyy-MM-dd") << ", " << NOW.toString("hh:mm:ss.z") << ", " << (NOW.toMSecsSinceEpoch() - m_csvLoggingStartTime.toMSecsSinceEpoch())/1000.00; +#else + ss << NOW.toString("yyyy-MM-dd") << ", " << NOW.toString("hh:mm:ss.z") << ", " << (NOW.toTime_t() - m_csvLoggingStartTime.toTime_t())/1000.00; +#endif ss << ", " << m_csvLoggingConnected; foreach(PlotData* plotData2, m_curvesData.values()) {