diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-11-25 15:12:55 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-11-27 07:26:59 +0200 |
| commit | 181b94d709e37ecd26c22629a5f1add125ea0454 (patch) | |
| tree | 646887e0a8b69991b89f8ed522635abf8553aebd | |
| parent | 59d929603c47cac8b0d55feb0516148c2f36b663 (diff) | |
qtbase: update PACKAGECONFIGs
Add configuration for odbc and brotli, and use system sqlite
if enabled.
Change-Id: I7065bb00be3aa60e438a55c78a8361d102262e0e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | coin/test-configs.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/coin/test-configs.inc b/coin/test-configs.inc index ffc8b33..213c925 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -35,7 +35,7 @@ ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" PACKAGECONFIG_append_pn-qtbase = "\ tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \ - sql-mysql sql-psql sql-sqlite journald \ + sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ " diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index d1ec744..643ee1d 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -99,14 +99,17 @@ PACKAGECONFIG[widgets] = "-DFEATURE_widgets=ON,-DFEATURE_widgets=OFF" PACKAGECONFIG[gtk] = "-DFEATURE_gtk3=ON,-DFEATURE_gtk3=OFF,gtk+3 at-spi2-core" # network +PACKAGECONFIG[brotli] = "-DFEATURE_brotli=ON,-DFEATURE_brotli=OFF,brotli" PACKAGECONFIG[gssapi] = "-DFEATURE_gssapi=ON,-DFEATURE_gssapi=OFF,krb5" PACKAGECONFIG[libproxy] = "-DFEATURE_libproxy=ON,-DFEATURE_libproxy=OFF,libproxy" PACKAGECONFIG[openssl] = "-DFEATURE_openssl_${OPENSSL_LINKING_MODE}=ON,-DFEATURE_openssl=OFF,openssl,libssl" # sqldrivers PACKAGECONFIG[sql-mysql] = "-DFEATURE_sql_mysql=ON,-DFEATURE_sql_mysql=OFF,mysql5" +PACKAGECONFIG[sql-odbc] = "-DFEATURE_sql_odbc=ON,-DFEATURE_sql_odbc=OFF,unixodbc" PACKAGECONFIG[sql-psql] = "-DFEATURE_sql_psql=ON,-DFEATURE_sql-psql=OFF,postgresql" -PACKAGECONFIG[sql-sqlite] = "-DFEATURE_sql_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sqlite3" +PACKAGECONFIG[sql-sqlite] = "-DFEATURE_system_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sqlite3" + EXTRA_OECMAKE += "\ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ |