GA release and make initial message show in GA version

This commit is contained in:
Bill Somerville
2018-12-09 21:18:08 +00:00
parent 7dd0dc9319
commit 205024f8ef
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -2,5 +2,5 @@
set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 0)
set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 6) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
#set (WSJTX_RC 6) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build
+3 -3
View File
@@ -945,10 +945,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000);
if(QCoreApplication::applicationVersion().contains("-devel") or
QCoreApplication::applicationVersion().contains("-rc")) {
//if(QCoreApplication::applicationVersion().contains("-devel") or
// QCoreApplication::applicationVersion().contains("-rc")) {
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
}
//}
if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true);