From 747426fe3a51042780ad67a58fe4fa8a548bad72 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Wed, 14 May 2014 17:32:31 +0000
Subject: [PATCH] Fix qmake build issue where CMake generated macros were
 erroneously being used in non-CMake builds.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4139 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 main.cpp       | 4 ++++
 mainwindow.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/main.cpp b/main.cpp
index 28e05db7a..35135525f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -47,9 +47,13 @@ int main(int argc, char *argv[])
 	      
       // Override programs executable basename as application name.
       a.setApplicationName ("WSJT-X");
+#if CMAKE_BUILD
       a.setApplicationVersion (WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR)
                                "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)
                                "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ());
+#else
+      a.setApplicationVersion ("1.4.0");
+#endif
 
       bool multiple {false};
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d6c21a394..4c03d5c3c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//--------------------------------------------------------- MainWindow
+//-------------------------------------------------------- MainWindow
 
 #include "mainwindow.h"