7 files changed, 205 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt
new file mode 100644
index 0000000000..1676396f3a
--- /dev/null
+++ b/src/plugins/sqldrivers/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from sqldrivers.pro.
+
+# TODO sqldrivers_standalone {
+#     _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
+#     load(qt_configure)
+# }
+
+qt_feature_module_begin(
+    NO_MODULE
+    PUBLIC_FILE "qtsqldrivers-config.h"
+    PRIVATE_FILE "qtsqldrivers-config_p.h"
+)
+include(configure.cmake)
+qt_feature_module_end(NO_MODULE)
+
+
+if(QT_FEATURE_sql_psql)
+    add_subdirectory(psql)
+endif()
+
+if(QT_FEATURE_sql_mysql)
+#     TODO add_subdirectory(mysql)
+endif()
+
+if(QT_FEATURE_sql_odbc)
+    add_subdirectory(odbc)
+endif()
+
+if(QT_FEATURE_sql_tds)
+#     TODO add_subdirectory(tds)
+endif()
+
+if(QT_FEATURE_sql_oci)
+#     TODO add_subdirectory(oci)
+endif()
+
+if(QT_FEATURE_sql_db2)
+#     TODO add_subdirectory(db2)
+endif()
+
+if(QT_FEATURE_sql_sqlite)
+    add_subdirectory(sqlite)
+endif()
+
+if(QT_FEATURE_sql_sqlite2)
+#     TODO add_subdirectory(sqlite2)
+endif()
+
+if(QT_FEATURE_sql_ibase)
+#     TODO add_subdirectory(ibase)
+endif()
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
new file mode 100644
index 0000000000..41a66197d1
--- /dev/null
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -0,0 +1,58 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+find_package(PostgreSQL)
+set_package_properties(PostgreSQL PROPERTIES TYPE OPTIONAL)
+find_package(ODBC)
+set_package_properties(ODBC PROPERTIES TYPE OPTIONAL)
+find_package(SQLite3)
+set_package_properties(SQLite3 PROPERTIES TYPE OPTIONAL)
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("sql_db2" PRIVATE
+    LABEL "DB2 (IBM)"
+    CONDITION libs.db2 OR FIXME
+)
+qt_feature("sql_ibase" PRIVATE
+    LABEL "InterBase"
+    CONDITION libs.ibase OR FIXME
+)
+qt_feature("sql_mysql" PRIVATE
+    LABEL "MySql"
+    CONDITION libs.mysql OR FIXME
+)
+qt_feature("sql_oci" PRIVATE
+    LABEL "OCI (Oracle)"
+    CONDITION libs.oci OR FIXME
+)
+qt_feature("sql_odbc" PRIVATE
+    LABEL "ODBC"
+    CONDITION QT_FEATURE_datestring AND ODBC_FOUND
+)
+qt_feature("sql_psql" PRIVATE
+    LABEL "PostgreSQL"
+    CONDITION PostgreSQL_FOUND
+)
+qt_feature("sql_sqlite2" PRIVATE
+    LABEL "SQLite2"
+    CONDITION libs.sqlite2 OR FIXME
+)
+qt_feature("sql_sqlite" PRIVATE
+    LABEL "SQLite"
+    CONDITION QT_FEATURE_datestring AND SQLite3_FOUND
+)
+qt_feature("sql_tds" PRIVATE
+    LABEL "TDS (Sybase)"
+    CONDITION QT_FEATURE_datestring AND libs.tds OR FIXME
+)
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index cd20eef1df..441cdc4885 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -216,9 +216,7 @@
         {
             "type": "warning",
             "condition": "config.win32 && !config.msvc && features.sql-oci",
-            "message": "Qt does not support compiling the Oracle database driver with
-MinGW, due to lack of such support from Oracle. Consider disabling the
-Oracle driver, as the current build will most likely fail."
+            "message": "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
         }
     ],
 
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
new file mode 100644
index 0000000000..c3c52f526c
--- /dev/null
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -0,0 +1,33 @@
+find_package(ODBC) # special case
+
+#####################################################################
+## qsqlodbc Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlodbc
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_odbc.cpp qsql_odbc_p.h
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        ODBC::ODBC
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:odbc.pro:<NONE>:
+# OTHER_FILES = "odbc.json"
+# PLUGIN_CLASS_NAME = "QODBCDriverPlugin"
+# _LOADED = "qt_plugin"
+
+## Scopes:
+#####################################################################
+
+extend_target(qsqlodbc CONDITION UNIX
+    DEFINES
+        UNICODE
+)
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 7f98efccba..5bf23fdaed 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -2649,3 +2649,5 @@ bool QODBCDriver::isIdentifierEscaped(const QString &identifier, IdentifierType)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsql_odbc_p.cpp"
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
new file mode 100644
index 0000000000..dfbeaba6de
--- /dev/null
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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
+find_package(PostgreSQL) # special case
+
+#####################################################################
+## qsqlpsql Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlpsql
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_psql.cpp qsql_psql_p.h
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        PostgreSQL::PostgreSQL
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:psql.pro:<NONE>:
+# OTHER_FILES = "psql.json"
+# PLUGIN_CLASS_NAME = "QPSQLDriverPlugin"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
new file mode 100644
index 0000000000..4034f3f4e0
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from sqlite.pro.
+
+#####################################################################
+## qsqlite Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlite
+    TYPE sqldrivers
+    SOURCES
+        qsql_sqlite.cpp qsql_sqlite_p.h
+        smain.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+        SQLite::SQLite3
+)
+
+#### Keys ignored in scope 1:.:sqlite.pro:<NONE>:
+# 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)) ...