Regenerate sqldrivers plugins

Change-Id: I583b5936205495813cdb0f04fcdd2da3c7e2a3f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

11 files changed, 196 insertions, 24 deletions

diff --git a/src/plugins/sqldrivers/.prev_CMakeLists.txt b/src/plugins/sqldrivers/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8752cf701f
--- /dev/null
+++ b/src/plugins/sqldrivers/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from sqldrivers.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(ldrivers_FIXME
+    VERSION 6.0.0
+    DESCRIPTION "Qt ldrivers_FIXME Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+qt_build_repo()
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt
index 75ac876f70..d45f5712a8 100644
--- a/src/plugins/sqldrivers/CMakeLists.txt
+++ b/src/plugins/sqldrivers/CMakeLists.txt
@@ -1,5 +1,8 @@
 # Generated from sqldrivers.pro.
 
+# special case begin
+# Currently handled completely manually.
+
 # TODO sqldrivers_standalone {
 #     _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
 #     load(qt_configure)
@@ -49,3 +52,4 @@ endif()
 if(QT_FEATURE_sql_ibase)
 #     TODO add_subdirectory(ibase)
 endif()
+# special case end
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index 45df43837f..9fc1691bdf 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -24,7 +24,6 @@ add_qt_plugin(qsqldb2
 
 #### Keys ignored in scope 1:.:.:db2.pro:<TRUE>:
 # OTHER_FILES = "db2.json"
-# PLUGIN_CLASS_NAME = "QDB2DriverPlugin"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
index 21e03ec52c..49cb6bfc87 100644
--- a/src/plugins/sqldrivers/mysql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -24,4 +24,3 @@ add_qt_plugin(qsqlmysql
 
 #### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>:
 # OTHER_FILES = "mysql.json"
-# PLUGIN_CLASS_NAME = "QMYSQLDriverPlugin"
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index 35747834f8..a2cfb11167 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -24,7 +24,6 @@ add_qt_plugin(qsqloci
 
 #### Keys ignored in scope 1:.:.:oci.pro:<TRUE>:
 # OTHER_FILES = "oci.json"
-# PLUGIN_CLASS_NAME = "QOCIDriverPlugin"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ac3297eaaf
--- /dev/null
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from odbc.pro.
+
+#####################################################################
+## qsqlodbc Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlodbc
+    TYPE sqldrivers
+    CLASS_NAME QODBCDriverPlugin
+    SOURCES
+        main.cpp
+        qsql_odbc.cpp qsql_odbc_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        ODBC::ODBC
+        Qt::Core
+        Qt::Sql
+)
+
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
+# OTHER_FILES = "odbc.json"
+
+## Scopes:
+#####################################################################
+
+extend_target(qsqlodbc CONDITION UNIX
+    DEFINES
+        UNICODE
+)
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index b6ea71be01..542d3b9727 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -1,9 +1,11 @@
-qt_find_package(ODBC) # special case
+# Generated from odbc.pro.
 
 #####################################################################
 ## qsqlodbc Plugin:
 #####################################################################
 
+qt_find_package(ODBC) # special case
+
 add_qt_plugin(qsqlodbc
     TYPE sqldrivers
     CLASS_NAME QODBCDriverPlugin
@@ -11,19 +13,19 @@ add_qt_plugin(qsqlodbc
         main.cpp
         qsql_odbc.cpp qsql_odbc_p.h
     DEFINES
-        QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
     LIBRARIES
-        ODBC::ODBC
-        Qt::Core
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        ODBC::ODBC
+        Qt::Core
+        Qt::Sql
 )
 
-#### Keys ignored in scope 1:.:odbc.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
 # OTHER_FILES = "odbc.json"
-# PLUGIN_CLASS_NAME = "QODBCDriverPlugin"
-# _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1d810767bf
--- /dev/null
+++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from psql.pro.
+
+#####################################################################
+## qsqlpsql Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlpsql
+    TYPE sqldrivers
+    CLASS_NAME QPSQLDriverPlugin
+    SOURCES
+        main.cpp
+        qsql_psql.cpp qsql_psql_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        PostgreSQL::PostgreSQL
+        Qt::Core
+        Qt::Sql
+)
+
+#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
+# OTHER_FILES = "psql.json"
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index 7339fb7c1d..54da39a51a 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from psql.pro.
+
 # FIXME cmake FindPostgreSQL is more exhaustive than the check we have for libpq-fe.h
 # it also checks for catalog/pg_type.h which is a more internal include, we should
 # add a way to tell cmake FindPostgreSQL to optionally only look for the libpq-fe.h one
@@ -14,16 +16,16 @@ add_qt_plugin(qsqlpsql
         main.cpp
         qsql_psql.cpp qsql_psql_p.h
     DEFINES
-        QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
     LIBRARIES
-        PostgreSQL::PostgreSQL
-        Qt::Core
         Qt::CorePrivate
         Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        PostgreSQL::PostgreSQL
+        Qt::Core
+        Qt::Sql
 )
 
-#### Keys ignored in scope 1:.:psql.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
 # OTHER_FILES = "psql.json"
-# PLUGIN_CLASS_NAME = "QPSQLDriverPlugin"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d39b81cc7f
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -0,0 +1,90 @@
+# Generated from sqlite.pro.
+
+#####################################################################
+## qsqlite Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlite
+    TYPE sqldrivers
+    CLASS_NAME QSQLiteDriverPlugin
+    SOURCES
+        qsql_sqlite.cpp qsql_sqlite_p.h
+        smain.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::SqlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Sql
+)
+
+#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>:
+# OTHER_FILES = "sqlite.json"
+# QT_FOR_CONFIG = "sqldrivers-private"
+
+## Scopes:
+#####################################################################
+
+extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite
+    PUBLIC_LIBRARIES
+        sqlite
+)
+
+extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite
+    SOURCES
+        ../../../3rdparty/sqlite/sqlite3.c
+    DEFINES
+        SQLITE_ENABLE_COLUMN_METADATA
+        SQLITE_ENABLE_FTS3
+        SQLITE_ENABLE_FTS3_PARENTHESIS
+        SQLITE_ENABLE_FTS5
+        SQLITE_ENABLE_JSON1
+        SQLITE_ENABLE_RTREE
+        SQLITE_OMIT_COMPLETE
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/sqlite
+)
+
+extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        NDEBUG
+)
+
+extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        SQLITE_DISABLE_LFS
+)
+
+extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        HAVE_POSIX_FALLOCATE=1
+)
+
+extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        SQLITE_OS_WINRT
+)
+
+#### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT:
+# QMAKE_CFLAGS = "-Gy"
+
+extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        _QNX_SOURCE
+)
+
+extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone
+    DEFINES
+        HAVE_USLEEP=1
+)
+
+extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY:
+# QMAKE_CFLAGS = "-include" "qplatformdefs.h"
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index 105d8028a9..50e3ba69ec 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -11,23 +11,25 @@ add_qt_plugin(qsqlite
         qsql_sqlite.cpp qsql_sqlite_p.h
         smain.cpp
     DEFINES
-        QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
     LIBRARIES
-        Qt::Core
         Qt::CorePrivate
         Qt::SqlPrivate
-        SQLite::SQLite3
+        SQLite::SQLite3 # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Sql
 )
 
-#### Keys ignored in scope 1:.:sqlite.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>:
 # OTHER_FILES = "sqlite.json"
-# PLUGIN_CLASS_NAME = "QSQLiteDriverPlugin"
 # QT_FOR_CONFIG = "sqldrivers-private"
-# _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
 
-# special case: Remove dead stuff
-# extend_target(qsqlite CONDITION (NOT (ON)) AND (CONFIG(release,debug OR release)) ...
+# special case begin
+# Remove non-system-sqlite code
+# extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite
+# special case end