From cb93d8f3d1c97e80a0ff29eef2793cc6ccefc967 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Thu, 25 Sep 2014 19:17:19 +0000
Subject: [PATCH] Moving WSJT-X "trunk" on to v1.5.

If built with  qmake the version string will now  be "Not for Release"
since some  many features essential  to making a complete  package are
currently only build when using CMake.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4372 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 Configuration.cpp  | 6 ++++++
 Versions.cmake     | 2 +-
 main.cpp           | 2 +-
 mainwindow.cpp     | 4 ++++
 revision_utils.cpp | 2 +-
 wsjtx.pro          | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index e9f13b752..f5aee7485 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -597,6 +597,12 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS
 
   ui_->setupUi (this);
 
+
+#if !defined (CMAKE_BUILD)
+#define WSJT_SHARE_DESTINATION "."
+#define WSJT_DOC_DESTINATION "."
+#endif
+
   // we must find this before changing the CWD since that breaks
   // QCoreApplication::applicationDirPath() which is used internally
   // by QStandardPaths :(
diff --git a/Versions.cmake b/Versions.cmake
index a4771ef03..4252a4bd1 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 1)
-set (WSJTX_VERSION_MINOR 4)
+set (WSJTX_VERSION_MINOR 5)
 set (WSJTX_VERSION_PATCH 0)
 set (WSJTX_RC 1)
 set (WSJTX_VERSION_IS_RELEASE 0)
diff --git a/main.cpp b/main.cpp
index dcbb12260..5cf7b3407 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
                                "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)
                                "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ());
 #else
-      a.setApplicationVersion ("1.4.0");
+      a.setApplicationVersion ("Not for Release");
 #endif
 
       bool multiple {false};
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 13a779a7c..ba7d90db9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1016,14 +1016,18 @@ void MainWindow::msgBox(QString t)                             //msgBox
 
 void MainWindow::on_actionOnline_User_Guide_triggered()      //Display manual
 {
+#if defined (CMAKE_BUILD)
   QDesktopServices::openUrl (QUrl (PROJECT_MANUAL_DIRECTORY_URL "/" PROJECT_MANUAL));
+#endif
 }
 
 //Display local copy of manual
 void MainWindow::on_actionLocal_User_Guide_triggered()
 {
+#if defined (CMAKE_BUILD)
   auto file = m_config.doc_path ().absoluteFilePath (PROJECT_MANUAL);
   QDesktopServices::openUrl (QUrl {"file:///" + file});
+#endif
 }
 
 void MainWindow::on_actionWide_Waterfall_triggered()      //Display Waterfalls
diff --git a/revision_utils.cpp b/revision_utils.cpp
index 9f93c51e5..6c5e246c8 100644
--- a/revision_utils.cpp
+++ b/revision_utils.cpp
@@ -82,7 +82,7 @@ QString program_title (QString const& revision)
 # endif
 
 #else
-  QString id {"WSJT-X   v1.4";
+  QString id {"WSJT-X Not for Release"};
 #endif
   return id + " " + revision + "  by K1JT";
 }
diff --git a/wsjtx.pro b/wsjtx.pro
index 7f834b893..1a7bb0908 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -10,7 +10,7 @@ CONFIG   += thread
 #CONFIG   += console
 
 TARGET = wsjtx
-VERSION = 1.4
+VERSION = "Not for Release"
 TEMPLATE = app
 DEFINES = QT5
 QMAKE_CXXFLAGS += -std=c++11