mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-21 19:55:20 -05:00
Merge branch 'release-2.5.0' of bitbucket.org:k1jt/wsjtx into release-2.5.0
This commit is contained in:
commit
9397bdfbea
@ -12,6 +12,10 @@
|
||||
Copyright 2001 - 2021 by Joe Taylor, K1JT.
|
||||
|
||||
|
||||
Release: WSJT-X 2.5.0-rc2
|
||||
Jun 28, 2021
|
||||
-------------------------
|
||||
|
||||
Release: WSJT-X 2.5.0-rc1
|
||||
Jun 3, 2021
|
||||
-------------------------
|
||||
|
@ -19,7 +19,7 @@ int main(int argc, char *argv[])
|
||||
QApplication a {argc, argv};
|
||||
// Override programs executable basename as application name.
|
||||
a.setApplicationName ("MAP65");
|
||||
a.setApplicationVersion ("3.0.0-devel");
|
||||
a.setApplicationVersion ("3.0.0-rc2");
|
||||
// switch off as we share an Info.plist file with WSJT-X
|
||||
a.setAttribute (Qt::AA_DontUseNativeMenuBar);
|
||||
MainWindow w;
|
||||
|
@ -1028,7 +1028,7 @@ 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.5.0 made\n"
|
||||
"available for testing purposes. By design it will\n"
|
||||
@ -1037,7 +1037,6 @@ void MainWindow::not_GA_warning_message ()
|
||||
if (now >= QDateTime {{2021, 8, 31}, {23, 59, 59, 999}, Qt::UTC}) {
|
||||
Q_EMIT finished ();
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void MainWindow::initialize_fonts ()
|
||||
|
Loading…
Reference in New Issue
Block a user