diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-29 19:45:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-03 13:38:08 +0000 |
| commit | 715465a93b1d1ec1f290821db88adeb705cf57f8 (patch) | |
| tree | 5ecafde66da5a018cacc31c3c2a5d6d98ffb20db /src/plugins | |
| parent | 461020a86aa5822325edba9ec565db39e5df8092 (diff) | |
Regenerate configure.json files after changes
Use all the original non-normalized feature names, and normalize them
in CMake land rather than Python. This gives us the necessary
original name information for further usage when generating qmake
pri and prl files.
Change-Id: If9db9028dac6175b8f6971e4b91558d76b8e9296
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/configure.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index e34200bf8f..c8005e16a7 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -20,39 +20,39 @@ qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3) #### Features -qt_feature("sql_db2" PRIVATE +qt_feature("sql-db2" PRIVATE LABEL "DB2 (IBM)" CONDITION DB2_FOUND ) -qt_feature("sql_ibase" PRIVATE +qt_feature("sql-ibase" PRIVATE LABEL "InterBase" CONDITION libs.ibase OR FIXME ) -qt_feature("sql_mysql" PRIVATE +qt_feature("sql-mysql" PRIVATE LABEL "MySql" CONDITION MySQL_FOUND ) -qt_feature("sql_oci" PRIVATE +qt_feature("sql-oci" PRIVATE LABEL "OCI (Oracle)" CONDITION Oracle_FOUND ) -qt_feature("sql_odbc" PRIVATE +qt_feature("sql-odbc" PRIVATE LABEL "ODBC" CONDITION QT_FEATURE_datestring AND ODBC_FOUND ) -qt_feature("sql_psql" PRIVATE +qt_feature("sql-psql" PRIVATE LABEL "PostgreSQL" CONDITION PostgreSQL_FOUND ) -qt_feature("sql_sqlite2" PRIVATE +qt_feature("sql-sqlite2" PRIVATE LABEL "SQLite2" CONDITION libs.sqlite2 OR FIXME ) -qt_feature("sql_sqlite" PRIVATE +qt_feature("sql-sqlite" PRIVATE LABEL "SQLite" CONDITION QT_FEATURE_datestring AND SQLite3_FOUND ) -qt_feature("sql_tds" PRIVATE +qt_feature("sql-tds" PRIVATE LABEL "TDS (Sybase)" CONDITION QT_FEATURE_datestring AND libs.tds OR FIXME ) |