7 files changed, 15 insertions, 3 deletions
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index 506627105..98e6a3db4 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -1125,3 +1125,5 @@ void QAbstractTexture::updateData(const QTextureDataUpdate &update)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstracttexture.cpp"
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 2d41af8e2..97b60566d 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -274,3 +274,5 @@ QAbstractTextureImage::QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Q
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstracttextureimage.cpp"
diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp
index a741205af..147f6c4c4 100644
--- a/src/render/texture/qpaintedtextureimage.cpp
+++ b/src/render/texture/qpaintedtextureimage.cpp
@@ -264,3 +264,5 @@ bool QPaintedTextureImageDataGenerator::operator ==(const QTextureImageDataGener
 
 QT_END_NAMESPACE
 
+#include "moc_qpaintedtextureimage.cpp"
+
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index 10e6c327e..b91398168 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1514,8 +1514,8 @@ QTextureLoader::QTextureLoader(QNode *parent)
 
     // Regenerate the texture functor when properties we support overriding
     // from QAbstractTexture get changed.
-    Q_D(QTextureLoader);
-    auto regenerate = [=] () {
+    auto regenerate = [this] () {
+        Q_D(QTextureLoader);
         if (!notificationsBlocked())    // check the change doesn't come from the backend
             d->updateGenerator();
     };
@@ -1775,3 +1775,5 @@ void QSharedGLTexture::setTextureId(int id)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qtexture.cpp"
diff --git a/src/render/texture/qtexturedataupdate.h b/src/render/texture/qtexturedataupdate.h
index f222fd6ec..69715888f 100644
--- a/src/render/texture/qtexturedataupdate.h
+++ b/src/render/texture/qtexturedataupdate.h
@@ -65,7 +65,7 @@ public:
     { swap(other); return *this; }
     ~QTextureDataUpdate();
 
-    void swap(QTextureDataUpdate &other) noexcept { qSwap(d_ptr, other.d_ptr); }
+    void swap(QTextureDataUpdate &other) noexcept { d_ptr.swap(other.d_ptr); }
 
     int x() const;
     int y() const;
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index c2d2308af..3f2f892e4 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -319,3 +319,5 @@ bool QImageTextureDataFunctor::isMirrored() const
 
 QT_END_NAMESPACE
 
+#include "moc_qtextureimage.cpp"
+
diff --git a/src/render/texture/qtexturewrapmode.cpp b/src/render/texture/qtexturewrapmode.cpp
index cb9272895..18a7f78a1 100644
--- a/src/render/texture/qtexturewrapmode.cpp
+++ b/src/render/texture/qtexturewrapmode.cpp
@@ -182,3 +182,5 @@ QTextureWrapMode::WrapMode QTextureWrapMode::z() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qtexturewrapmode.cpp"