From 205024f8effecc7b5a77a6e159df2169710bbfbc Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sun, 9 Dec 2018 21:18:08 +0000
Subject: [PATCH 1/2] GA release and make initial message show in GA version

---
 Versions.cmake         | 4 ++--
 widgets/mainwindow.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Versions.cmake b/Versions.cmake
index 03d068716..bd0597607 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -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
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 6848bb3fa..c75fb03dd 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -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);

From 784f75ea74c190875fdb2ded286b54bbeffa0076 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sun, 9 Dec 2018 22:47:45 +0000
Subject: [PATCH 2/2] Fix an issue with g++ v8.2 compiles

---
 widgets/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index c75fb03dd..42dac2f5a 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -35,6 +35,7 @@
 #include <QActionGroup>
 #include <QSplashScreen>
 #include <QUdpSocket>
+#include <QAbstractItemView>
 
 #include "revision_utils.hpp"
 #include "qt_helpers.hpp"