This code now compiles OK in either Qt4 or Qt5. To run in Qt5 we'll need

a Qt5-compatible "thermo" widget.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3310 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-23 20:21:47 +00:00
parent 3ecf743667
commit 05e7a095d4
6 changed files with 24 additions and 5 deletions

View File

@ -1,8 +1,11 @@
#ifndef LogQSO_H
#define LogQSO_H
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui>
//#include <QDialog>
#endif
namespace Ui {
class LogQSO;

View File

@ -1,4 +1,8 @@
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QApplication>
#include <portaudio.h>
#include "mainwindow.h"

View File

@ -9,8 +9,11 @@
#include "getfile.h"
#include <portaudio.h>
#include "logqso.h"
//#include <QtConcurrent/QtConcurrentMap>
//#include <QtConcurrent/QtConcurrentRun>
#ifdef QT5
#include <QtConcurrent/QtConcurrentMap>
#include <QtConcurrent/QtConcurrentRun>
#endif
int itone[85]; //Tx audio tones for 85 symbols
int icw[250]; //Dits for CW ID

View File

@ -1,6 +1,10 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QTimer>
#include <QDateTime>
#include "soundin.h"

View File

@ -7,7 +7,11 @@
#ifndef PLOTTER_H
#define PLOTTER_H
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFrame>
#include <QImage>
#include <cstring>

View File

@ -14,9 +14,10 @@ DESTDIR = ../wsjtx_install
#DESTDIR = ../qt5_install
VERSION = 0.99
TEMPLATE = app
DEFINES = QT4
win32 {
DEFINES = WIN32
DEFINES += WIN32
F90 = g95
g95.output = ${QMAKE_FILE_BASE}.o
g95.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
@ -25,7 +26,7 @@ QMAKE_EXTRA_COMPILERS += g95
}
unix {
DEFINES = UNIX
DEFINES += UNIX
F90 = gfortran
gfortran.output = ${QMAKE_FILE_BASE}.o
gfortran.commands = $$F90 -c -O2 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}