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
This commit is contained in:
Joe Taylor 2013-07-26 18:39:24 +00:00
parent 8eea459960
commit 44e55a8a1c
2 changed files with 4 additions and 5 deletions

View File

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

View File

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