Build fixes 3

CMakeLists.txt

@@ -456,6 +456,16 @@ endif()
 # declarations etc.
 set(CMAKE_AUTOMOC ON)
 
+# Although AUTOMOC is pretty neat when it works, it can be problematic.  Part of what it does is #include all the
+# generated files (eg "moc_AboutDialog.cpp") into a single intermediate source file, which it then compiles.  We have
+# sometimes had compiler errors from this because of various Qt headers complaining about things being redefined.  The
+# brute-force workaround is, on CMake builds, to manually include these generated files in our corresponding .cpp file
+# (eg "AboutDialog.cpp"), which then stops CMake pulling those generated files into its intermediate source file.
+#
+# (We don't want to do this extra manual include on the Meson builds because then we'd get duplicate symbols at the
+# linking stage.)
+add_compile_definitions(BUILDING_WITH_CMAKE)
+
 # Set the AUTOUIC property on all targets.  This tells CMake to automatically handle the Qt uic code generator, without
 # having to use commands such as QT4_WRAP_UI(), QT5_WRAP_UI(), etc.
 set(CMAKE_AUTOUIC ON)

src/AboutDialog.cpp

@@ -27,8 +27,10 @@
 
 #include "config.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_AboutDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_AboutDialog.cpp"
+#endif
 
 AboutDialog::AboutDialog(QWidget * parent) :
    QDialog(parent),

src/AlcoholTool.cpp

@@ -34,8 +34,10 @@
 #include "measurement/SystemOfMeasurement.h"
 #include "widgets/ToggleSwitch.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_AlcoholTool.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_AlcoholTool.cpp"
+#endif
 
 // Settings we only use in this file under the PersistentSettings::Sections::alcoholTool section
 #define AddSettingName(name) namespace { BtStringConst const name{#name}; }

src/AncestorDialog.cpp

@@ -37,8 +37,10 @@
 #include "model/NamedEntity.h"
 #include "model/Recipe.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_AncestorDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_AncestorDialog.cpp"
+#endif
 
 AncestorDialog::AncestorDialog(QWidget * parent) : QDialog(parent) {
 

src/BeerColorWidget.cpp

@@ -26,8 +26,10 @@
 
 #include "config.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BeerColorWidget.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BeerColorWidget.cpp"
+#endif
 
 // TODO: make the size adjust inside the container.
 BeerColorWidget::BeerColorWidget(QWidget* parent) : QWidget(parent) {

src/BrewDayFormatter.cpp

@@ -30,8 +30,10 @@
 #include "model/Style.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BrewDayFormatter.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BrewDayFormatter.cpp"
+#endif
 
 BrewDayFormatter::BrewDayFormatter(QObject * parent)
    : QObject(parent) {

src/BrewDayScrollWidget.cpp

@@ -41,8 +41,10 @@
 #include "PersistentSettings.h"
 #include "TimerWidget.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BrewDayScrollWidget.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BrewDayScrollWidget.cpp"
+#endif
 
 namespace {
    QString styleName(Style const * style) {

src/BrewNoteWidget.cpp

@@ -29,8 +29,10 @@
 #include "model/BrewNote.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BrewNoteWidget.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BrewNoteWidget.cpp"
+#endif
 
 namespace {
    double const lowLimitPct  = 0.95;

src/BtDatePopup.cpp

@@ -20,8 +20,10 @@
 #include <QtGui>
 #include "BtDatePopup.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BtDatePopup.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BtDatePopup.cpp"
+#endif
 
 //! \brief set up the popup window.
 BtDatePopup::BtDatePopup(QWidget* parent) : QDialog(parent, Qt::Popup)

src/BtSplashScreen.cpp

@@ -21,8 +21,10 @@
 
 #include "config.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BtSplashScreen.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BtSplashScreen.cpp"
+#endif
 
 namespace {
    static QString const logoFile = QString{":images/%1.svg"}.arg(CONFIG_APPLICATION_NAME_LC);

src/BtTabWidget.cpp

@@ -26,8 +26,10 @@
 #include "model/Recipe.h"
 #include "model/Style.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BtTabWidget.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BtTabWidget.cpp"
+#endif
 
 
 //! \brief set up the popup window.

src/BtTextEdit.cpp

@@ -22,8 +22,10 @@
 #include <QDebug>
 #include <QSettings>
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_BtTextEdit.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_BtTextEdit.cpp"
+#endif
 
 BtTextEdit::BtTextEdit([[maybe_unused]] QWidget * parent) : wasModified{false} {
 

src/ConverterTool.cpp

@@ -24,8 +24,10 @@
 
 #include "measurement/Unit.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_ConverterTool.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_ConverterTool.cpp"
+#endif
 
 ConverterTool::ConverterTool(QWidget* parent) : QDialog(parent) {
    this->doLayout();

src/HelpDialog.cpp

@@ -25,8 +25,10 @@
 #include "Logging.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_HelpDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_HelpDialog.cpp"
+#endif
 
 // This private implementation class holds all private non-virtual members of HelpDialog
 class HelpDialog::impl {

src/HydrometerTool.cpp

@@ -32,8 +32,10 @@
 #include "Algorithms.h"
 #include "measurement/Unit.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_HydrometerTool.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_HydrometerTool.cpp"
+#endif
 
 HydrometerTool::HydrometerTool(QWidget* parent) : QDialog(parent) {
    this->doLayout();

src/IbuGuSlider.cpp

@@ -16,8 +16,10 @@
 
 #include "IbuGuSlider.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_IbuGuSlider.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_IbuGuSlider.cpp"
+#endif
 
 IbuGuSlider::IbuGuSlider(QWidget* parent)
    : RangedSlider(parent)

src/LatestReleaseFinder.cpp

@@ -28,8 +28,10 @@
 
 #include "config.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_LatestReleaseFinder.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_LatestReleaseFinder.cpp"
+#endif
 
 void LatestReleaseFinder::checkMainRespository() {
 

src/MainWindow.cpp

@@ -159,8 +159,10 @@
 #include "utils/BtStringConst.h"
 #include "utils/OptionalHelpers.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_MainWindow.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_MainWindow.cpp"
+#endif
 
 namespace {
 

src/MashDesigner.cpp

@@ -32,8 +32,10 @@
 #include "model/Fermentable.h"
 #include "PhysicalConstants.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_MashDesigner.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_MashDesigner.cpp"
+#endif
 
 MashDesigner::MashDesigner(QWidget * parent) : QDialog       {parent},
                                                m_recObs      {nullptr},

src/MashWizard.cpp

@@ -37,8 +37,10 @@
 #include "model/MashStep.h"
 #include "PhysicalConstants.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_MashWizard.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_MashWizard.cpp"
+#endif
 
 MashWizard::MashWizard(QWidget* parent) :
    QDialog(parent),

src/NamedEntitySortProxyModel.cpp

@@ -19,8 +19,10 @@
 #include <QDebug>
 #include <QAbstractItemModel>
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_NamedEntitySortProxyModel.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_NamedEntitySortProxyModel.cpp"
+#endif
 
 NamedEntitySortProxyModel::NamedEntitySortProxyModel(QAbstractItemModel* sourceModel)
    : QSortFilterProxyModel(sourceModel)

src/OgAdjuster.cpp

@@ -26,8 +26,10 @@
 #include "model/Equipment.h"
 #include "model/Recipe.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_OgAdjuster.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_OgAdjuster.cpp"
+#endif
 
 OgAdjuster::OgAdjuster( QWidget* parent ) :
    QDialog{parent},

src/OptionDialog.cpp

@@ -52,8 +52,10 @@
 #include "measurement/UnitSystem.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_OptionDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_OptionDialog.cpp"
+#endif
 
 //
 // Anonymous namespace for constants, global variables and functions used only in this file

src/PitchDialog.cpp

@@ -29,8 +29,10 @@
 #include "measurement/Unit.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_PitchDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_PitchDialog.cpp"
+#endif
 
 PitchDialog::PitchDialog(QWidget* parent) : QDialog(parent) {
    setupUi(this);

src/PrimingDialog.cpp

@@ -27,8 +27,10 @@
 
 #include "measurement/Unit.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_PrimingDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_PrimingDialog.cpp"
+#endif
 
 PrimingDialog::PrimingDialog(QWidget* parent) : QDialog(parent) {
    this->setupUi(this);

src/PrintAndPreviewDialog.cpp

@@ -29,8 +29,10 @@
 
 #include "InventoryFormatter.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_PrintAndPreviewDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_PrintAndPreviewDialog.cpp"
+#endif
 
 /**
  * @brief Construct a new Print And Preview Dialog:: Print And Preview Dialog object

src/RangedSlider.cpp

@@ -34,8 +34,10 @@
 #include <QRectF>
 #include <QToolTip>
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_RangedSlider.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_RangedSlider.cpp"
+#endif
 
 RangedSlider::RangedSlider(QWidget* parent)
    : QWidget(parent),

src/RecipeExtrasWidget.cpp

@@ -28,8 +28,10 @@
 #include "undoRedo/Undoable.h"
 #include "utils/OptionalHelpers.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_RecipeExtrasWidget.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_RecipeExtrasWidget.cpp"
+#endif
 
 RecipeExtrasWidget::RecipeExtrasWidget(QWidget* parent) :
    QWidget(parent),

src/RecipeFormatter.cpp

@@ -58,8 +58,10 @@
 #include "model/Yeast.h"
 #include "PersistentSettings.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_RecipeFormatter.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_RecipeFormatter.cpp"
+#endif
 
 namespace {
    //! Get the maximum number of characters in a list of strings.

src/RefractoDialog.cpp

@@ -29,8 +29,10 @@
 #include "Algorithms.h"
 #include "measurement/Measurement.h"
 
-// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
-#include "moc_RefractoDialog.cpp"
+#ifdef BUILDING_WITH_CMAKE
+   // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake
+   #include "moc_RefractoDialog.cpp"
+#endif
 
 RefractoDialog::RefractoDialog(QWidget* parent) : QDialog(parent) {
    setupUi(this);