From c33fe44b98b7423174a009619bfe0426fa1062ad Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 14 May 2014 17:43:30 +0000
Subject: [PATCH] Fix several problems in wsjtx.pro, for qmake builds.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4140 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp |  2 +-
 wsjtx.pro      | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4c03d5c3c..d6c21a394 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------- MainWindow
+//--------------------------------------------------------- MainWindow
 
 #include "mainwindow.h"
 
diff --git a/wsjtx.pro b/wsjtx.pro
index 7a39f0d21..b85c56b6f 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -10,12 +10,11 @@ CONFIG   += thread
 #CONFIG   += console
 
 TARGET = wsjtx
-#DESTDIR = ../qt4_install
 DESTDIR = ../wsjtx_install
-VERSION = 1.2
+VERSION = 1.4
 TEMPLATE = app
 DEFINES = QT5
-HAMLIB_DIR = ../../hamlib-1.2.15.3
+HAMLIB_DIR = ../../hamlib3/mingw32
 QMAKE_CXXFLAGS += -std=c++11
 
 F90 = gfortran
@@ -119,9 +118,8 @@ LIBS += -lfftw3f $$system($$F90 -print-file-name=libgfortran.so)
 }
 
 win32 {
-INCLUDEPATH += $(HAMLIB_DIR)/include
-LIBS += -L$(HAMLIB_DIR)/lib -lhamlib
-#LIBS += -L$(HAMLIB_DIR)/lib -lhamlib
+INCLUDEPATH += $${HAMLIB_DIR}/include
+LIBS += -L${HAMLIB_DIR}/lib -lhamlib
 LIBS += -L./lib -lastro -ljt9
 LIBS += -L. -lfftw3f_win
 LIBS += -lws2_32