From c453173a036b6457845d62ffabbbbb02a169e6ef Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 27 Apr 2022 20:21:26 +0200
Subject: [PATCH] QtOpenGL: includemocs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Including moc files directly into their classes' TU tends to improve
codegen and enables extended compiler warnings, e.g. about unused
private functions or fields.

Pick-to: 6.3 6.2 5.15
Task-number: QTBUG-102886
Change-Id: I60fb8c22a310dfd10cd3611fb603e2175ac6dbcc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/opengl/qopenglcompositor.cpp          | 2 ++
 src/opengl/qopenglengineshadermanager.cpp | 2 ++
 src/opengl/qopenglshaderprogram.cpp       | 2 ++
 src/opengl/qopengltexture.cpp             | 2 ++
 src/opengl/qopengltimerquery.cpp          | 2 ++
 src/opengl/qopenglwindow.cpp              | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/src/opengl/qopenglcompositor.cpp b/src/opengl/qopenglcompositor.cpp
index 9f661510ad..dd07fb2bef 100644
--- a/src/opengl/qopenglcompositor.cpp
+++ b/src/opengl/qopenglcompositor.cpp
@@ -311,3 +311,5 @@ void QOpenGLCompositor::changeWindowIndex(QOpenGLCompositorWindow *window, int n
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qopenglcompositor_p.cpp"
diff --git a/src/opengl/qopenglengineshadermanager.cpp b/src/opengl/qopenglengineshadermanager.cpp
index 679c39385d..6eea91bed7 100644
--- a/src/opengl/qopenglengineshadermanager.cpp
+++ b/src/opengl/qopenglengineshadermanager.cpp
@@ -893,3 +893,5 @@ bool QOpenGLEngineShaderManager::useCorrectShaderProg()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qopenglengineshadermanager_p.cpp"
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp
index d4dee6c674..6db5b5917e 100644
--- a/src/opengl/qopenglshaderprogram.cpp
+++ b/src/opengl/qopenglshaderprogram.cpp
@@ -3812,3 +3812,5 @@ bool QOpenGLShaderProgramPrivate::linkBinary()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qopenglshaderprogram.cpp"
diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp
index 809ffaf634..d0dc781ada 100644
--- a/src/opengl/qopengltexture.cpp
+++ b/src/opengl/qopengltexture.cpp
@@ -4872,3 +4872,5 @@ QDebug operator<<(QDebug debug, const QOpenGLTexture *t)
 #endif // QT_NO_DEBUG_STREAM
 
 QT_END_NAMESPACE
+
+#include "moc_qopengltexture.cpp"
diff --git a/src/opengl/qopengltimerquery.cpp b/src/opengl/qopengltimerquery.cpp
index 921a9f759f..2b107f79e9 100644
--- a/src/opengl/qopengltimerquery.cpp
+++ b/src/opengl/qopengltimerquery.cpp
@@ -878,3 +878,5 @@ void QOpenGLTimeMonitor::reset()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qopengltimerquery.cpp"
diff --git a/src/opengl/qopenglwindow.cpp b/src/opengl/qopenglwindow.cpp
index d000dced94..3daf6ab73a 100644
--- a/src/opengl/qopenglwindow.cpp
+++ b/src/opengl/qopenglwindow.cpp
@@ -696,3 +696,5 @@ QPaintDevice *QOpenGLWindow::redirected(QPoint *) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qopenglwindow.cpp"