From ebf91d1d13ddc058115f0062a499d0e39e0e957b Mon Sep 17 00:00:00 2001 From: Li Xinwei <1326710505@qq.com> Date: Thu, 29 Apr 2021 22:29:32 +0800 Subject: [PATCH] Fix wrong note "Using pthreads" and only show it for WASM MSVC does not have pthreads. "QT_FEATURE_thread" should mean "Enable thread support". And I think this note is only meaningful for WASM. For other platforms, thread support should be enabled by default. amends 4972fdb350fe79e18b0413e74028cd9b9803f96b Change-Id: I5a4fc05219c9b2ff9c6e54fd444b4b94230727bb Reviewed-by: Alexandru Croitor --- configure.cmake | 4 ++-- configure.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.cmake b/configure.cmake index 743c3193091..78d585f670c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1131,8 +1131,8 @@ qt_configure_add_report_entry( ) qt_configure_add_report_entry( TYPE NOTE - MESSAGE "Using pthreads" - CONDITION QT_FEATURE_thread + MESSAGE "Enable thread support" + CONDITION QT_FEATURE_thread AND WASM ) qt_configure_add_report_entry( TYPE WARNING diff --git a/configure.json b/configure.json index 27267544401..7d5f6e77a07 100644 --- a/configure.json +++ b/configure.json @@ -1514,8 +1514,8 @@ }, { "type": "note", - "condition": "features.thread", - "message": "Using pthreads" + "condition": "features.thread && config.wasm", + "message": "Enable thread support" }, { "type": "error",