Add some special case markers that seem to have been neglected

At least, running util/cmake/configurejson2cmake.py changes these lines.
Adding them has provoked the script to add a .prev_configure.cmake file.

Change-Id: Idc123d1dee2ce51cd640c090c7910ecc1f0fc5a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 79 insertions, 2 deletions

diff --git a/src/plugins/sqldrivers/.prev_configure.cmake b/src/plugins/sqldrivers/.prev_configure.cmake
new file mode 100644
index 0000000000..d742018b9f
--- /dev/null
+++ b/src/plugins/sqldrivers/.prev_configure.cmake
@@ -0,0 +1,77 @@
+
+
+#### Inputs
+
+# input sqlite
+set(INPUT_sqlite "undefined" CACHE STRING "")
+set_property(CACHE INPUT_sqlite PROPERTY STRINGS undefined qt system)
+
+
+
+#### Libraries
+
+qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2 MODULE_NAME sqldrivers QMAKE_LIB db2)
+qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL MODULE_NAME sqldrivers QMAKE_LIB mysql)
+qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME sqldrivers QMAKE_LIB psql)
+qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci)
+qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
+qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
+if(NOT WIN32 AND QT_FEATURE_system_zlib)
+    qt_add_qmake_lib_dependency(sqlite3 zlib)
+endif()
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("sql-db2" PRIVATE
+    LABEL "DB2 (IBM)"
+    CONDITION DB2_FOUND
+)
+qt_feature("sql-ibase" PRIVATE
+    LABEL "InterBase"
+    CONDITION libs.ibase OR FIXME
+)
+qt_feature("sql-mysql" PRIVATE
+    LABEL "MySql"
+    CONDITION MySQL_FOUND
+)
+qt_feature("sql-oci" PRIVATE
+    LABEL "OCI (Oracle)"
+    CONDITION Oracle_FOUND
+)
+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-sqlite" PRIVATE
+    LABEL "SQLite"
+    CONDITION QT_FEATURE_datestring
+)
+qt_feature("system-sqlite" PRIVATE
+    LABEL "  Using system provided SQLite"
+    AUTODETECT OFF
+    CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND
+)
+qt_configure_add_summary_section(NAME "Qt Sql Drivers")
+qt_configure_add_summary_entry(ARGS "sql-db2")
+qt_configure_add_summary_entry(ARGS "sql-ibase")
+qt_configure_add_summary_entry(ARGS "sql-mysql")
+qt_configure_add_summary_entry(ARGS "sql-oci")
+qt_configure_add_summary_entry(ARGS "sql-odbc")
+qt_configure_add_summary_entry(ARGS "sql-psql")
+qt_configure_add_summary_entry(ARGS "sql-sqlite")
+qt_configure_add_summary_entry(ARGS "system-sqlite")
+qt_configure_end_summary_section() # end of "Qt Sql Drivers" section
+qt_configure_add_report_entry(
+    TYPE WARNING
+    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."
+    CONDITION WIN32 AND NOT MSVC AND QT_FEATURE_sql_oci
+)
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
index 473e7901b7..25384f3c52 100644
--- a/src/plugins/sqldrivers/configure.cmake
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -16,7 +16,7 @@ qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME s
 qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci)
 qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
 qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
-qt_find_package(Interbase PROVIDED_TARGETS Interbase::Interbase MODULE_NAME sqldrivers QMAKE_LIB ibase)
+qt_find_package(Interbase PROVIDED_TARGETS Interbase::Interbase MODULE_NAME sqldrivers QMAKE_LIB ibase) # special case
 if(NOT WIN32 AND QT_FEATURE_system_zlib)
     qt_add_qmake_lib_dependency(sqlite3 zlib)
 endif()
@@ -34,7 +34,7 @@ qt_feature("sql-db2" PRIVATE
 )
 qt_feature("sql-ibase" PRIVATE
     LABEL "InterBase"
-    CONDITION Interbase_FOUND
+    CONDITION Interbase_FOUND # special case
 )
 qt_feature("sql-mysql" PRIVATE
     LABEL "MySql"