Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

This commit is contained in:
Steven Franke 2021-05-29 09:36:52 -05:00
commit 834bc6db4d

View File

@ -1031,14 +1031,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message () void MainWindow::not_GA_warning_message ()
{ {
MessageBox::critical_message (this, // MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.4.0 made\n" // "This is a pre-release version of WSJT-X 2.4.0 made\n"
"available for testing purposes. By design it will\n" // "available for testing purposes. By design it will\n"
"be nonfunctional after May 30, 2021."); // "be nonfunctional after May 30, 2021.");
auto now = QDateTime::currentDateTimeUtc (); // auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2021, 5, 30}, {23, 59, 59, 999}, Qt::UTC}) { // if (now >= QDateTime {{2021, 5, 30}, {23, 59, 59, 999}, Qt::UTC}) {
Q_EMIT finished (); // Q_EMIT finished ();
} // }
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()