diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt
index 0e11fced12d..88c2d9ee3c2 100644
--- a/tests/auto/sql/kernel/qsql/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsql.pro.
+
+#####################################################################
+## tst_qsql Test:
+#####################################################################
+
 add_qt_test(tst_qsql
-    SOURCES tst_qsql.cpp
+    SOURCES
+        tst_qsql.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
index 344d96406ba..ad0cefa460d 100644
--- a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqldatabase.pro.
+
+#####################################################################
+## tst_qsqldatabase Test:
+#####################################################################
+
 add_qt_test(tst_qsqldatabase
-    SOURCES tst_qsqldatabase.cpp
+    SOURCES
+        tst_qsqldatabase.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
index 66139b08c9a..a59ee08ea78 100644
--- a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqldriver.pro.
+
+#####################################################################
+## tst_qsqldriver Test:
+#####################################################################
+
 add_qt_test(tst_qsqldriver
-    SOURCES tst_qsqldriver.cpp
+    SOURCES
+        tst_qsqldriver.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
index 4c2b7a89880..45e7bb383be 100644
--- a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
@@ -1 +1,12 @@
-add_qt_test(tst_qsqlerror SOURCES tst_qsqlerror.cpp LIBRARIES Qt::Sql)
+# Generated from qsqlerror.pro.
+
+#####################################################################
+## tst_qsqlerror Test:
+#####################################################################
+
+add_qt_test(tst_qsqlerror
+    SOURCES
+        tst_qsqlerror.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
index 71b470706f4..0a570ed1f24 100644
--- a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
@@ -1 +1,12 @@
-add_qt_test(tst_qsqlfield SOURCES tst_qsqlfield.cpp LIBRARIES Qt::Sql)
+# Generated from qsqlfield.pro.
+
+#####################################################################
+## tst_qsqlfield Test:
+#####################################################################
+
+add_qt_test(tst_qsqlfield
+    SOURCES
+        tst_qsqlfield.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
index 5c357656794..dd7703b4013 100644
--- a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqlquery.pro.
+
+#####################################################################
+## tst_qsqlquery Test:
+#####################################################################
+
 add_qt_test(tst_qsqlquery
-    SOURCES tst_qsqlquery.cpp
+    SOURCES
+        tst_qsqlquery.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
index 68c80ed9907..743dc27e9d6 100644
--- a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
@@ -1 +1,12 @@
-add_qt_test(tst_qsqlrecord SOURCES tst_qsqlrecord.cpp LIBRARIES Qt::Sql)
+# Generated from qsqlrecord.pro.
+
+#####################################################################
+## tst_qsqlrecord Test:
+#####################################################################
+
+add_qt_test(tst_qsqlrecord
+    SOURCES
+        tst_qsqlrecord.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
index 01ac844bc5d..91762a0f6c3 100644
--- a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Generated from qsqlresult.pro.
+
+#####################################################################
+## tst_qsqlresult Test:
+#####################################################################
+
 add_qt_test(tst_qsqlresult
     SOURCES
         testsqldriver.h
@@ -5,4 +11,6 @@ add_qt_test(tst_qsqlresult
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
index 77762d286fd..793e8c7fd55 100644
--- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqlthread.pro.
+
+#####################################################################
+## tst_qsqlthread Test:
+#####################################################################
+
 add_qt_test(tst_qsqlthread
-    SOURCES tst_qsqlthread.cpp
+    SOURCES
+        tst_qsqlthread.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
index 0233cd8dc8e..1c8a2372b69 100644
--- a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
@@ -1,7 +1,17 @@
+# Generated from qsqlquerymodel.pro.
+
+#####################################################################
+## tst_qsqlquerymodel Test:
+#####################################################################
+
 add_qt_test(tst_qsqlquerymodel
-    SOURCES tst_qsqlquerymodel.cpp
+    SOURCES
+        tst_qsqlquerymodel.cpp
     LIBRARIES
-        Qt::Widgets
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Sql
+        Qt::Widgets
 )
diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
index f84a74417c2..979d3a4f434 100644
--- a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
@@ -1,7 +1,16 @@
+# Generated from qsqlrelationaldelegate.pro.
+
+#####################################################################
+## tst_qsqlrelationaldelegate Test:
+#####################################################################
+
 add_qt_test(tst_qsqlrelationaldelegate
-    SOURCES tst_qsqlrelationaldelegate.cpp
+    SOURCES
+        tst_qsqlrelationaldelegate.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
         Qt::Widgets
 )
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
index efb2aa84a57..2dea59b79d0 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqlrelationaltablemodel.pro.
+
+#####################################################################
+## tst_qsqlrelationaltablemodel Test:
+#####################################################################
+
 add_qt_test(tst_qsqlrelationaltablemodel
-    SOURCES tst_qsqlrelationaltablemodel.cpp
+    SOURCES
+        tst_qsqlrelationaltablemodel.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )
diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
index b364e176f00..a251847181d 100644
--- a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
+++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
@@ -1,6 +1,15 @@
+# Generated from qsqltablemodel.pro.
+
+#####################################################################
+## tst_qsqltablemodel Test:
+#####################################################################
+
 add_qt_test(tst_qsqltablemodel
-    SOURCES tst_qsqltablemodel.cpp
+    SOURCES
+        tst_qsqltablemodel.cpp
     LIBRARIES
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Sql
 )