Merge 890a115 into 73101f4

opencor · Nov 14, 2019 · 175b24d · 175b24d
2 parents 73101f4 + 890a115
commit 175b24d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp b/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp
@@ -84,8 +84,6 @@ TabBarWidget::~TabBarWidget()
 
     delete style();
 }
-#else
-TabBarWidget::~TabBarWidget() = default;
 #endif
 
 //==============================================================================

diff --git a/src/plugins/miscellaneous/Core/src/tabbarwidget.h b/src/plugins/miscellaneous/Core/src/tabbarwidget.h
@@ -44,7 +44,9 @@ class CORE_EXPORT TabBarWidget : public QTabBar
 
 public:
     explicit TabBarWidget(QWidget *pParent);
+#ifdef Q_OS_MAC
     ~TabBarWidget() override;
+#endif
 
     int oldIndex() const;
     void setOldIndex(int pOldIndex);

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -102,10 +102,6 @@ SimulationObject::SimulationObject(Simulation *pSimulation) :
 
 //==============================================================================
 
-SimulationObject::~SimulationObject() = default;
-
-//==============================================================================
-
 Simulation * SimulationObject::simulation() const
 {
     // Return our simulation

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -101,7 +101,6 @@ class SimulationObject : public QObject
 
 public:
     explicit SimulationObject(Simulation *pSimulation);
-    ~SimulationObject() override;
 
 public slots:
     Simulation * simulation() const;