From 3fc6365928ec104ff1c0cae01d42ebe931d5c212 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Wed, 7 Nov 2018 18:11:01 +0000
Subject: [PATCH] Fix up QMake file for new directory layout - needs testing

---
 wsjtx.pro | 62 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/wsjtx.pro b/wsjtx.pro
index 0615a89b8..d4cb84870 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 QT       += network multimedia
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
 CONFIG   += thread
 #CONFIG   += console
 
@@ -50,40 +50,47 @@ DEFINES += UNIX
 SOURCES += \
   logbook/adif.cpp logbook/countriesworked.cpp logbook/logbook.cpp \
         logbook/AD1CCty.cpp logbook/WorkedBefore.cpp \
-  astro.cpp Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \
+  widgets/astro.cpp Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \
   Transceiver.cpp TransceiverBase.cpp TransceiverFactory.cpp \
-  PollingTransceiver.cpp EmulateSplitTransceiver.cpp LettersSpinBox.cpp \
+  PollingTransceiver.cpp EmulateSplitTransceiver.cpp widgets/LettersSpinBox.cpp \
   HRDTransceiver.cpp DXLabSuiteCommanderTransceiver.cpp \
-  HamlibTransceiver.cpp FrequencyLineEdit.cpp Bands.cpp \
-  FrequencyList.cpp StationList.cpp ForeignKeyDelegate.cpp \
-  FrequencyItemDelegate.cpp LiveFrequencyValidator.cpp \
+  HamlibTransceiver.cpp FrequencyLineEdit.cpp models/Bands.cpp \
+  models/FrequencyList.cpp models/StationList.cpp item_delegates/ForeignKeyDelegate.cpp \
+  item_delegates/FrequencyItemDelegate.cpp validators/LiveFrequencyValidator.cpp \
   Configuration.cpp	psk_reporter.cpp AudioDevice.cpp \
-  Modulator.cpp Detector.cpp logqso.cpp displaytext.cpp \
-  getfile.cpp soundout.cpp soundin.cpp meterwidget.cpp signalmeter.cpp \
-  WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \
-  main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
-  echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
+  Modulator.cpp Detector.cpp widgets/logqso.cpp widgets/displaytext.cpp \
+  getfile.cpp soundout.cpp soundin.cpp widgets/meterwidget.cpp widgets/signalmeter.cpp \
+  WFPalette.cpp widgets/plotter.cpp widgets/widegraph.cpp widgets/about.cpp \
+  WsprTxScheduler.cpp widgets/mainwindow.cpp \
+  main.cpp decodedtext.cpp wsprnet.cpp widgets/messageaveraging.cpp \
+  widgets/echoplot.cpp widgets/echograph.cpp widgets/fastgraph.cpp \
+  widgets/fastplot.cpp models/Modes.cpp \
   WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
-  MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
-  EqualizationToolsDialog.cpp CallsignValidator.cpp \
-  colorhighlighting.cpp ExportCabrillo.cpp LotWUsers.cpp TraceFile.cpp
+  MultiSettings.cpp PhaseEqualizationDialog.cpp models/IARURegions.cpp \
+  widgets/MessageBox.cpp \
+  EqualizationToolsDialog.cpp validators/CallsignValidator.cpp \
+  widgets/colorhighlighting.cpp widgets/ExportCabrillo.cpp LotWUsers.cpp TraceFile.cpp
 
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
   Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \
-  mainwindow.h plotter.h soundin.h soundout.h astro.h \
-  about.h WFPalette.hpp widegraph.h getfile.h decodedtext.h \
-  commons.h sleep.h displaytext.h logqso.h LettersSpinBox.hpp \
-  Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \
-  FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \
+  widgets/mainwindow.h widgets/plotter.h soundin.h soundout.h widgets/astro.h \
+  widgets/about.h WFPalette.hpp widgets/widegraph.h getfile.h decodedtext.h \
+  commons.h sleep.h widgets/displaytext.h widgets/logqso.h widgets/LettersSpinBox.hpp \
+  models/Bands.hpp models/FrequencyList.hpp models/StationList.hpp \
+  item_delegates/ForeignKeyDelegate.hpp item_delegates/FrequencyItemDelegate.hpp \
+  validators/LiveFrequencyValidator.hpp \
+  widgets/FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \
   Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \
   EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \
-  Configuration.hpp wsprnet.h signalmeter.h meterwidget.h logbook/WorkedBefore.hpp \
+  Configuration.hpp wsprnet.h widgets/signalmeter.h widgets/meterwidget.h logbook/WorkedBefore.hpp \
   logbook/logbook.h logbook/countriesworked.h logbook/adif.h logbook/AD1CCty.h \
-  messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
+  widgets/messageaveraging.h widgets/echoplot.h widgets/echograph.h widgets/fastgraph.h \
+  widgets/fastplot.h models/Modes.hpp WSPRBandHopping.hpp \
   WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
-  IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp CallsignValidator.hpp \
-  colorhighlighting.h ExportCabrillo.h LotWUsers.h TraceFile.hpp
+  models/IARURegions.hpp widgets/MessageBox.hpp EqualizationToolsDialog.hpp \
+  validators/CallsignValidator.hpp \
+  widgets/colorhighlighting.h widgets/ExportCabrillo.h LotWUsers.h TraceFile.hpp
 
 
 INCLUDEPATH += qmake_only
@@ -93,9 +100,12 @@ SOURCES += killbyname.cpp OmniRigTransceiver.cpp
 HEADERS += OmniRigTransceiver.hpp
 }
 
-FORMS    += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
-    logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \
-    fastgraph.ui colorhighlighting.ui ExportCabrillo.ui FoxLogWindow.ui
+FORMS    += widgets/mainwindow.ui widgets/about.ui Configuration.ui \
+    widgets/widegraph.ui widgets/astro.ui \
+    widgets/logqso.ui wf_palette_design_dialog.ui widgets/messageaveraging.ui
+    widgets/echograph.ui \
+    widgets/fastgraph.ui widgets/colorhighlighting.ui wodgets/ExportCabrillo.ui \
+    widgets/FoxLogWindow.ui
 
 RC_FILE = wsjtx.rc
 RESOURCES = wsjtx.qrc