w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 67a99ccbc4
commit c4e6f89b0b
6 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logqso.h
View File

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

4
main.cpp
View File

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

7
mainwindow.cpp
View File

@ -9,8 +9,11 @@
#include "getfile.h" #include "getfile.h"
#include <portaudio.h> #include <portaudio.h>
#include "logqso.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 itone[85]; //Tx audio tones for 85 symbols
int icw[250]; //Dits for CW ID int icw[250]; //Dits for CW ID

4
mainwindow.h
View File

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

4
plotter.h
View File

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

5
wsjtx.pro
View File

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