From 44e55a8a1c1b7fb4fa3603259b17e09da0b4605d Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 26 Jul 2013 18:39:24 +0000
Subject: [PATCH] Have now switched (permanently, I hope) to Qt5. Minor
 correction in plotter.cpp.

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

diff --git a/plotter.cpp b/plotter.cpp
index 360861f9c..9aad79453 100644
--- a/plotter.cpp
+++ b/plotter.cpp
@@ -488,11 +488,11 @@ void CPlotter::setPalette(QString palette)                      //setPalette()
     return;
   }
 
-  FILE* fp;
+  FILE* fp=NULL;
   if(palette=="Blue") fp=fopen("blue.dat","r");
   if(palette=="AFMHot") fp=fopen("afmhot.dat","r");
   if(palette=="Gray1") fp=fopen("gray1.dat","r");
-  if(int(fp)==0) {
+  if(fp==NULL) {
     QMessageBox msgBox0;
     QString t="Error: Cannot find requested palette file.";
     msgBox0.setText(t);
diff --git a/wsjtx.pro b/wsjtx.pro
index a9aa52474..de91e1fec 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -11,11 +11,10 @@ CONFIG   += thread
 
 TARGET = wsjtx
 DESTDIR = ../wsjtx_install
-#DESTDIR = ../qt5_install
 VERSION = 1.1
 TEMPLATE = app
-DEFINES = QT4
-#DEFINES = QT5
+#DEFINES = QT4
+DEFINES = QT5
 
 win32 {
 DEFINES += WIN32