From e92ec7bf9fea1d7065731aee1a482fada9f78392 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 12 Oct 2021 13:19:56 +0100 Subject: [PATCH] Bump revision and update nag message --- CMakeLists.txt | 4 ++-- widgets/mainwindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92722dcb7..dd68784f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ if (POLICY CMP0075) endif () project (wsjtx - VERSION 2.5.0.0 + VERSION 2.5.1.0 LANGUAGES C CXX Fortran ) set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") @@ -71,7 +71,7 @@ message (STATUS "******************************************************") include (set_build_type) # RC 0 or omitted is a development build, GA is a General Availability release build -set_build_type (GA) +set_build_type (RC 1) set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") # diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index c422e890f..87e42a6c4 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1026,11 +1026,11 @@ void MainWindow::not_GA_warning_message () { MessageBox::critical_message (this, - "This is a pre-release version of WSJT-X 2.5.0 made\n" + "This is a pre-release version of WSJT-X " + version (false) + " made\n" "available for testing purposes. By design it will\n" - "be nonfunctional after Sept 30, 2021."); + "be nonfunctional after Nov 30, 2021."); auto now = QDateTime::currentDateTimeUtc (); - if (now >= QDateTime {{2021, 9, 30}, {23, 59, 59, 999}, Qt::UTC}) { + if (now >= QDateTime {{2021, 11, 30}, {23, 59, 59, 999}, Qt::UTC}) { Q_EMIT finished (); } }