w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 21:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix up versioning after merge from release branch

Browse Source
This commit is contained in:
Bill Somerville 2020-12-01 16:06:56 +00:00
parent 6efdf28489
commit 7f1a537e6e
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -45,7 +45,7 @@ if (POLICY CMP0075)
endif () endif ()
project (wsjtx project (wsjtx
VERSION 2.3.0.0 VERSION 2.4.0.0
LANGUAGES C CXX Fortran LANGUAGES C CXX Fortran
) )
set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio")
@ -70,7 +70,7 @@ message (STATUS "******************************************************")
include (set_build_type) include (set_build_type)
# RC 0 or omitted is a development build, GA is a General Availability release build # RC 0 or omitted is a development build, GA is a General Availability release build
set_build_type (RC 3) set_build_type (RC 0)
set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}")
# #

16
widgets/mainwindow.cpp
View File

@ -1029,14 +1029,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message () void MainWindow::not_GA_warning_message ()
{ {
MessageBox::critical_message (this, // MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.3.0 made\n" // "This is a pre-release version of WSJT-X 2.3.0 made\n"
"available for testing purposes. By design it will\n" // "available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on Jan 19, 2021."); // "be nonfunctional after 0000 UTC on Jan 19, 2021.");
auto now = QDateTime::currentDateTimeUtc (); // auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) { // if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) {
Q_EMIT finished (); // Q_EMIT finished ();
} // }
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()