summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2024-02-29 14:34:21 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2024-03-04 12:03:34 +0100
commit30ff354d057a2517d928722402a3dabcc63c31ad (patch)
tree83a1bf4c6bf5bec898976534443f3991cdc9ac65
parent88bd63503bcf16f6d73d0e32167e7524b941a7a4 (diff)
Fix bundled minigbm
Pulls in the following patch: * 1f5b24f83ba Fix bundled minigbm Also add warning when minigbm is enabled. Pick-to: 6.7 Change-Id: Iea612dc030f7ee1d66da1fe8ef6a52ed9fc2a411 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
m---------src/3rdparty0
-rw-r--r--src/core/api/configure.cmake5
2 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 9edd685c47ec16dd6935ea7b872b37f8654e7a9
+Subproject 1f5b24f83baa747336b253cfcf18bf9231772cf
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index 6965c710c..9088e72d4 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -248,3 +248,8 @@ qt_configure_add_report_entry(
MESSAGE "VA-API is incompatible with system libvpx."
CONDITION QT_FEATURE_webengine_system_libvpx AND QT_FEATURE_webengine_vaapi
)
+qt_configure_add_report_entry(
+ TYPE WARNING
+ MESSAGE "System GBM is disabled. The bundled minigbm supports Intel only, you might need to install libgbm to avoid rendering issues."
+ CONDITION NOT QT_FEATURE_webengine_system_gbm
+)