From dcbfae6d02b04365691e024d1bc0807d213f2757 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 9 Nov 2018 18:49:33 +0000 Subject: [PATCH] Set up new source sub-directories in QMake project file QMake requies the inclusion of sub-projects syntax to introduce source sub-directories, hopefully this will allow code completion in QtCreator to function. --- item_delegates/item_delegates.pri | 7 ++++ logbook/logbook.pri | 11 +++++ models/models.pri | 13 ++++++ validators/validators.pri | 7 ++++ widgets/widgets.pri | 27 ++++++++++++ wsjtx.pro | 69 +++++++++++++------------------ 6 files changed, 94 insertions(+), 40 deletions(-) create mode 100644 item_delegates/item_delegates.pri create mode 100644 logbook/logbook.pri create mode 100644 models/models.pri create mode 100644 validators/validators.pri create mode 100644 widgets/widgets.pri diff --git a/item_delegates/item_delegates.pri b/item_delegates/item_delegates.pri new file mode 100644 index 000000000..d1d2c3ccc --- /dev/null +++ b/item_delegates/item_delegates.pri @@ -0,0 +1,7 @@ +SOURCES += \ + item_delegates/ForeignKeyDelegate.cpp \ + item_delegates/FrequencyItemDelegate.cpp + +HEADERS += \ + item_delegates/ForeignKeyDelegate.hpp \ + item_delegates/FrequencyItemDelegate.hpp diff --git a/logbook/logbook.pri b/logbook/logbook.pri new file mode 100644 index 000000000..fcac62524 --- /dev/null +++ b/logbook/logbook.pri @@ -0,0 +1,11 @@ +SOURCES += \ + logbook/countriesworked.cpp \ + logbook/logbook.cpp \ + logbook/AD1CCty.cpp \ + logbook/WorkedBefore.cpp + +HEADERS += \ + logbook/WorkedBefore.hpp \ + logbook/logbook.h \ + logbook/countriesworked.h \ + logbook/AD1CCty.hpp diff --git a/models/models.pri b/models/models.pri new file mode 100644 index 000000000..a88948fa7 --- /dev/null +++ b/models/models.pri @@ -0,0 +1,13 @@ +SOURCES += \ + models/Bands.cpp \ + models/FrequencyList.cpp \ + models/StationList.cpp \ + models/Modes.cpp \ + models/IARURegions.cpp + +HEADERS += \ + models/Bands.hpp \ + models/FrequencyList.hpp \ + models/StationList.hpp \ + models/Modes.hpp \ + models/IARURegions.hpp diff --git a/validators/validators.pri b/validators/validators.pri new file mode 100644 index 000000000..b8adf226d --- /dev/null +++ b/validators/validators.pri @@ -0,0 +1,7 @@ +SOURCES += \ + validators/LiveFrequencyValidator.cpp \ + validators/CallsignValidator.cpp + +HEADERS += \ + validators/LiveFrequencyValidator.hpp \ + validators/CallsignValidator.hpp diff --git a/widgets/widgets.pri b/widgets/widgets.pri new file mode 100644 index 000000000..a68f7ef91 --- /dev/null +++ b/widgets/widgets.pri @@ -0,0 +1,27 @@ +SOURCES += \ + widgets/astro.cpp widgets/LettersSpinBox.cpp \ + widgets/logqso.cpp widgets/displaytext.cpp \ + widgets/meterwidget.cpp widgets/signalmeter.cpp \ + widgets/plotter.cpp widgets/widegraph.cpp widgets/about.cpp \ + widgets/mainwindow.cpp widgets/messageaveraging.cpp \ + widgets/echoplot.cpp widgets/echograph.cpp widgets/fastgraph.cpp \ + widgets/fastplot.cpp widgets/MessageBox.cpp \ + widgets/colorhighlighting.cpp widgets/ExportCabrillo.cpp + +HEADERS += \ + widgets/mainwindow.h widgets/plotter.h \ + widgets/about.h widgets/widegraph.h \ + widgets/displaytext.h widgets/logqso.h widgets/LettersSpinBox.hpp \ + widgets/FrequencyLineEdit.hpp widgets/signalmeter.h \ + widgets/meterwidget.h widgets/messageaveraging.h \ + widgets/echoplot.h widgets/echograph.h widgets/fastgraph.h \ + widgets/fastplot.h widgets/MessageBox.hpp widgets/colorhighlighting.h \ + widgets/ExportCabrillo.h + +FORMS += \ + widgets/mainwindow.ui widgets/about.ui \ + widgets/widegraph.ui widgets/astro.ui \ + widgets/logqso.ui widgets/messageaveraging.ui \ + widgets/echograph.ui widgets/fastgraph.ui \ + widgets/colorhighlighting.ui wodgets/ExportCabrillo.ui \ + widgets/FoxLogWindow.ui diff --git a/wsjtx.pro b/wsjtx.pro index d4cb84870..7b05335d0 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -47,51 +47,43 @@ DEFINES += UNIX # # Order matters here as the link is in this order so referrers need to be after referred # +include(models/models.pri) +include(validators/validators.pri) +include(item_delegates/item_delegates.pri) +include(logbook/logbook.pri) +include(widgets/widgets.pri) + SOURCES += \ - logbook/adif.cpp logbook/countriesworked.cpp logbook/logbook.cpp \ - logbook/AD1CCty.cpp logbook/WorkedBefore.cpp \ - widgets/astro.cpp Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \ + Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \ Transceiver.cpp TransceiverBase.cpp TransceiverFactory.cpp \ - PollingTransceiver.cpp EmulateSplitTransceiver.cpp widgets/LettersSpinBox.cpp \ + PollingTransceiver.cpp EmulateSplitTransceiver.cpp \ HRDTransceiver.cpp DXLabSuiteCommanderTransceiver.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 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 \ + HamlibTransceiver.cpp FrequencyLineEdit.cpp \ + Configuration.cpp psk_reporter.cpp AudioDevice.cpp \ + Modulator.cpp Detector.cpp \ + getfile.cpp soundout.cpp soundin.cpp \ + WFPalette.cpp \ + WsprTxScheduler.cpp \ + main.cpp decodedtext.cpp wsprnet.cpp \ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.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 + MultiSettings.cpp PhaseEqualizationDialog.cpp \ + EqualizationToolsDialog.cpp \ + LotWUsers.cpp TraceFile.cpp HEADERS += qt_helpers.hpp \ pimpl_h.hpp pimpl_impl.hpp \ Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \ - 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 \ + soundin.h soundout.h \ + WFPalette.hpp getfile.h decodedtext.h \ + commons.h sleep.h \ + 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 widgets/signalmeter.h widgets/meterwidget.h logbook/WorkedBefore.hpp \ - logbook/logbook.h logbook/countriesworked.h logbook/adif.h logbook/AD1CCty.h \ - widgets/messageaveraging.h widgets/echoplot.h widgets/echograph.h widgets/fastgraph.h \ - widgets/fastplot.h models/Modes.hpp WSPRBandHopping.hpp \ + Configuration.hpp wsprnet.h \ + WSPRBandHopping.hpp \ WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \ - models/IARURegions.hpp widgets/MessageBox.hpp EqualizationToolsDialog.hpp \ - validators/CallsignValidator.hpp \ - widgets/colorhighlighting.h widgets/ExportCabrillo.h LotWUsers.h TraceFile.hpp - + EqualizationToolsDialog.hpp \ + LotWUsers.h TraceFile.hpp INCLUDEPATH += qmake_only @@ -100,12 +92,9 @@ SOURCES += killbyname.cpp OmniRigTransceiver.cpp HEADERS += OmniRigTransceiver.hpp } -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 +FORMS += \ + Configuration.ui \ + wf_palette_design_dialog.ui RC_FILE = wsjtx.rc RESOURCES = wsjtx.qrc