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

@@ -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};
 

mainwindow.cpp

@@ -1,4 +1,4 @@
-//--------------------------------------------------------- MainWindow
+//-------------------------------------------------------- MainWindow
 
 #include "mainwindow.h"