From ce13ca88005f684e36716b7a6e8f049c8d75509d Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Mon, 30 May 2022 13:55:01 +0200 Subject: [PATCH] Preparations for the release of WSJT-X v2.6.0-rc1. --- CMakeLists.txt | 2 +- widgets/mainwindow.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65dcb62d3..658820145 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 (RC 0) +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 aa754d832..586fa874c 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1052,14 +1052,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 " + version (false) + " made\n" - // "available for testing purposes. By design it will\n" - // "be nonfunctional after Nov 30, 2021."); - // auto now = QDateTime::currentDateTimeUtc (); - // if (now >= QDateTime {{2021, 11, 30}, {23, 59, 59, 999}, Qt::UTC}) { - // Q_EMIT finished (); - // } + MessageBox::critical_message (this, + "This is a pre-release version of WSJT-X 2.6.0 made\n" + "available for testing purposes. By design it will\n" + "be nonfunctional after Nov 30, 2022."); + auto now = QDateTime::currentDateTimeUtc (); + if (now >= QDateTime {{2022, 11, 30}, {23, 59, 59, 999}, Qt::UTC}) { + Q_EMIT finished (); + } } void MainWindow::initialize_fonts ()