From c40475953c1946f15158302708485f4e4a8b8efc Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 22 Jun 2021 18:51:57 +0100 Subject: [PATCH] Preparation for a v2.5.0 RC2 --- Release_Notes.txt | 4 ++++ map65/main.cpp | 2 +- widgets/mainwindow.cpp | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Release_Notes.txt b/Release_Notes.txt index 8e3999553..99b497426 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -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 ------------------------- diff --git a/map65/main.cpp b/map65/main.cpp index 918f64b43..fb910a116 100644 --- a/map65/main.cpp +++ b/map65/main.cpp @@ -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; diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 7958b79ce..dfc8cf2b2 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -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 ()