From e21df99708ccf0d37066b7ffb9bb87ad61ad6fca Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 27 Apr 2022 20:21:27 +0200
Subject: [PATCH] QtSql: includemocs

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: Id758d672710ba998595824645e3e16e00537781d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/sql/kernel/qsqldriver.cpp               | 2 ++
 src/sql/kernel/qsqldriverplugin.cpp         | 2 ++
 src/sql/models/qsqlquerymodel.cpp           | 2 ++
 src/sql/models/qsqlrelationaltablemodel.cpp | 2 ++
 src/sql/models/qsqltablemodel.cpp           | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index eb8646d785..965467c6f0 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -844,3 +844,5 @@ int QSqlDriver::maximumIdentifierLength(QSqlDriver::IdentifierType type) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqldriver.cpp"
diff --git a/src/sql/kernel/qsqldriverplugin.cpp b/src/sql/kernel/qsqldriverplugin.cpp
index 8e9982fca2..262578422f 100644
--- a/src/sql/kernel/qsqldriverplugin.cpp
+++ b/src/sql/kernel/qsqldriverplugin.cpp
@@ -100,3 +100,5 @@ QSqlDriverPlugin::~QSqlDriverPlugin()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqldriverplugin.cpp"
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index 2e37c9e5aa..7103794178 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -721,3 +721,5 @@ QModelIndex QSqlQueryModel::indexInQuery(const QModelIndex &item) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqlquerymodel.cpp"
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index ffabf83831..ad4c81fa1e 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -792,3 +792,5 @@ bool QSqlRelationalTableModel::removeColumns(int column, int count, const QModel
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqlrelationaltablemodel.cpp"
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 4e534bd15b..6b4f046021 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -1464,3 +1464,5 @@ QSqlRecord QSqlTableModel::primaryValues(int row) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsqltablemodel.cpp"