From 108162274b54f33de3bf6e30e239ae98c8acdc63 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 25 Aug 2024 15:58:25 +0200 Subject: [PATCH] SQL/plugins: Fix configure options '-sql-' The configure options '-sql-' and '-no-sql-' did not work as expected because they were overridden by some ancient 'plugin-sql-' option. It looks like an ancient relict from Qt4 times where you could specify if a sql driver could be built as plugin or as built-in module which is not supported anymore since Qt5.8. Pick-to: 6.7 6.5 Fixes: QTBUG-128337 Change-Id: I7f0a0cf4b1dd11af32c48b50ceacf0f26eafffcf Reviewed-by: Joerg Bornemann (cherry picked from commit 8a0c86651f1e5091c4fb5ef8cbbcef53a9e336eb) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/sqldrivers/qt_cmdline.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/plugins/sqldrivers/qt_cmdline.cmake b/src/plugins/sqldrivers/qt_cmdline.cmake index 2bb1fc64ebe..c7cac9efacb 100644 --- a/src/plugins/sqldrivers/qt_cmdline.cmake +++ b/src/plugins/sqldrivers/qt_cmdline.cmake @@ -12,11 +12,3 @@ qt_commandline_option(sql-odbc TYPE boolean) qt_commandline_option(sql-psql TYPE boolean) qt_commandline_option(sql-sqlite TYPE boolean) qt_commandline_option(sql-mimer TYPE boolean) -qt_commandline_option(plugin-sql-db2 TYPE void NAME sql-db2) -qt_commandline_option(plugin-sql-ibase TYPE void NAME sql-ibase) -qt_commandline_option(plugin-sql-mysql TYPE void NAME sql-mysql) -qt_commandline_option(plugin-sql-oci TYPE void NAME sql-oci) -qt_commandline_option(plugin-sql-odbc TYPE void NAME sql-odbc) -qt_commandline_option(plugin-sql-psql TYPE void NAME sql-psql) -qt_commandline_option(plugin-sql-sqlite TYPE void NAME sql-sqlite) -qt_commandline_option(plugin-sql-mimer TYPE void NAME sql-mimer)