12 files changed, 28 insertions, 8 deletions
diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp
index e6c37b241..c6a4fb47c 100644
--- a/src/render/materialsystem/filterkey.cpp
+++ b/src/render/materialsystem/filterkey.cpp
@@ -83,7 +83,7 @@ void FilterKey::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     }
 }
 
-bool FilterKey::operator ==(const FilterKey &other)
+bool FilterKey::equals(const FilterKey &other) const
 {
     if (&other == this)
         return true;
@@ -97,11 +97,6 @@ bool FilterKey::operator ==(const FilterKey &other)
             other.value() == value());
 }
 
-bool FilterKey::operator !=(const FilterKey &other)
-{
-    return !operator ==(other);
-}
-
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/materialsystem/filterkey_p.h b/src/render/materialsystem/filterkey_p.h
index 91d0ba1f0..1fe6bba7b 100644
--- a/src/render/materialsystem/filterkey_p.h
+++ b/src/render/materialsystem/filterkey_p.h
@@ -72,10 +72,15 @@ public:
     const QVariant &value() const { return m_value; }
     const QString &name() const { return m_name; }
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
-    bool operator ==(const FilterKey &other);
-    bool operator !=(const FilterKey &other);
+
+    friend bool operator==(const FilterKey &lhs, const FilterKey &rhs)
+    { return lhs.equals(rhs); }
+    friend bool operator !=(const FilterKey &lhs, const FilterKey &rhs)
+    { return !lhs.equals(rhs); }
 
 private:
+    bool equals(const FilterKey &other) const;
+
     QVariant m_value;
     QString m_name;
 };
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 01d887792..f846c6bd3 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -280,3 +280,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QEffect::createNodeCreationChange() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qeffect.cpp"
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index 2105da987..9b65e82a3 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -155,3 +155,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QFilterKey::createNodeCreationChange() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qfilterkey.cpp"
diff --git a/src/render/materialsystem/qgraphicsapifilter.cpp b/src/render/materialsystem/qgraphicsapifilter.cpp
index e8b93de6e..5e04f2a20 100644
--- a/src/render/materialsystem/qgraphicsapifilter.cpp
+++ b/src/render/materialsystem/qgraphicsapifilter.cpp
@@ -373,3 +373,5 @@ bool operator !=(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qgraphicsapifilter.cpp"
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index f41dcacde..00c36b69a 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -313,3 +313,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QMaterial::createNodeCreationChange() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qmaterial.cpp"
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 969882564..d07b4b685 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -329,3 +329,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QParameter::createNodeCreationChange() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qparameter.cpp"
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index 33181f4fe..b2881ac20 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -413,3 +413,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderPass::createNodeCreationChange() cons
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderpass.cpp"
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index b70b99846..f695ebe3b 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -166,3 +166,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderData::createNodeCreationChange() cons
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderdata.cpp"
diff --git a/src/render/materialsystem/qshaderimage.cpp b/src/render/materialsystem/qshaderimage.cpp
index 7ab9e25e0..33b452026 100644
--- a/src/render/materialsystem/qshaderimage.cpp
+++ b/src/render/materialsystem/qshaderimage.cpp
@@ -989,3 +989,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr Qt3DRender::QShaderImage::createNodeCreation
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderimage.cpp"
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 49117dd98..dc6cb3c64 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -747,3 +747,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderProgram::createNodeCreationChange() c
 } // of namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderprogram.cpp"
diff --git a/src/render/materialsystem/qshaderprogrambuilder.cpp b/src/render/materialsystem/qshaderprogrambuilder.cpp
index 5530db2ee..ccb35084f 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.cpp
+++ b/src/render/materialsystem/qshaderprogrambuilder.cpp
@@ -516,3 +516,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderProgramBuilder::createNodeCreationCha
 } // of namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderprogrambuilder.cpp"