Merge branch 'develop' into feat-fst280

This commit is contained in:
Bill Somerville
2021-02-02 17:15:47 +00:00
13 changed files with 455 additions and 389 deletions
+6 -1
View File
@@ -7216,7 +7216,12 @@ void MainWindow::rigFailure (QString const& reason)
{
if (m_splash && m_splash->isVisible ()) m_splash->hide ();
m_rigErrorMessageBox.setDetailedText (reason + "\n\nTimestamp: "
+ QDateTime::currentDateTimeUtc ().toString (Qt::ISODateWithMs));
#if QT_VERSION >= QT_VERSION_CHECK (5, 8, 0)
+ QDateTime::currentDateTimeUtc ().toString (Qt::ISODateWithMs)
#else
+ QDateTime::currentDateTimeUtc ().toString ("yyyy-MM-ddTHH:mm:ss.zzzZ")
#endif
);
// don't call slot functions directly to avoid recursion
m_rigErrorMessageBox.exec ();