Merge branch 'release-2.2.0' of bitbucket.org:k1jt/wsjtx into release-2.2.0

This commit is contained in:
Joe Taylor 2020-06-01 12:26:52 -04:00
commit 7b21858fc1

View File

@ -996,14 +996,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.2.0 made\n" // "This is a pre-release version of WSJT-X 2.2.0 made\n"
"available for testing purposes. By design it will\n" // "available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on June 10, 2020."); // "be nonfunctional after 0000 UTC on June 10, 2020.");
auto now = QDateTime::currentDateTimeUtc (); // auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) { // if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) {
Q_EMIT finished (); // Q_EMIT finished ();
} // }
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()