9 files changed, 19 insertions, 36 deletions
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index a75d28e19d..637461e168 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -13,13 +13,11 @@ qt_add_plugin(QDB2DriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         DB2::DB2
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:db2.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
index 7a55786300..c99f322dfb 100644
--- a/src/plugins/sqldrivers/mysql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -13,13 +13,11 @@ qt_add_plugin(QMYSQLDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         MySQL::MySQL
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index d3c1d0c74c..713c9fc871 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -13,13 +13,11 @@ qt_add_plugin(QOCIDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         Oracle::OCI
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:oci.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
index 2452d50989..692d1fc294 100644
--- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -13,13 +13,11 @@ qt_add_plugin(QODBCDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         ODBC::ODBC
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index 0e19306786..5c163181c5 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -14,13 +14,11 @@ qt_add_plugin(QODBCDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         ODBC::ODBC
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
index 7df66eeb51..f3cec6d302 100644
--- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
@@ -13,13 +13,11 @@ qt_add_plugin(QPSQLDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         PostgreSQL::PostgreSQL
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index e4f794f523..03a2dc69c3 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -18,13 +18,11 @@ qt_add_plugin(QPSQLDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         PostgreSQL::PostgreSQL
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
index 6e17dfe302..d258c23821 100644
--- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -13,12 +13,10 @@ qt_add_plugin(QSQLiteDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
     PUBLIC_LIBRARIES
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>:
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index 98c94a426a..d1453638b3 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -13,13 +13,12 @@ qt_add_plugin(QSQLiteDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::SqlPrivate
+    LIBRARIES # special case
         SQLite::SQLite3 # special case
     PUBLIC_LIBRARIES
         Qt::Core
-        Qt::Sql
+        Qt::CorePrivate
+        Qt::SqlPrivate
 )
 
 #### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>: