w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

This commit is contained in:
Bill Somerville 2021-05-22 01:37:33 +01:00
parent 0f5ea155db
commit ea0cc0271c
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/mainwindow.cpp
View File

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