From 64c0b304f131d950c3392745ce9f7058b4e1e7a4 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 7 Feb 2018 20:53:11 +0000
Subject: [PATCH] Possible warning message for users of -devel and -rc?
revisions.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8476 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
CMakeLists.txt | 2 +-
Versions.cmake | 4 ++--
mainwindow.cpp | 12 +++++++++++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dd2e4e13..3f8f6a2db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -952,7 +952,7 @@ if (Fortran_COMPILER_NAME MATCHES "gfortran.*")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
endif (CMAKE_OSX_SYSROOT)
- set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -fno-f2c ${General_FFLAGS}")
+ set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fbounds-check -funroll-all-loops -fno-f2c ${General_FFLAGS}")
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}")
elseif (Fortran_COMPILER_NAME MATCHES "ifort.*")
# ifort (untested)
diff --git a/Versions.cmake b/Versions.cmake
index 11b2106d3..52ea7ebd7 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -1,6 +1,6 @@
# Version number components
set (WSJTX_VERSION_MAJOR 1)
-set (WSJTX_VERSION_MINOR 7)
-set (WSJTX_VERSION_PATCH 1)
+set (WSJTX_VERSION_MINOR 9)
+set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3c85f4a13..c99181787 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -915,7 +915,17 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
"Please use WSJT-X v1.8.0\n", errorMsg);
Q_EMIT finished ();
}
-
+/*
+ if(QCoreApplication::applicationVersion().contains("-devel") or
+ QCoreApplication::applicationVersion().contains("-rc")) {
+ QString errorMsg;
+ MessageBox::critical_message (this,
+ "This version of WSJT-X was built from code in the\n"
+ "development branch, or is a Release Candidate.\n"
+ "On-the-air use carries an obligation to report\n"
+ "problems to the WSJT Development group.\n\n", errorMsg);
+ }
+*/
if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true);
ui->cbMenus->setChecked(false);