Merge branch 'release-2.3.0' into develop

This commit is contained in:
Bill Somerville
2021-01-28 11:17:51 +00:00
6 changed files with 24 additions and 21 deletions
+6 -1
View File
@@ -7215,7 +7215,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 ();