Skip to content

Commit

Permalink
Fix wrong note "Using pthreads" and only show it for WASM
Browse files Browse the repository at this point in the history
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 4972fdb

Change-Id: I5a4fc05219c9b2ff9c6e54fd444b4b94230727bb
Reviewed-by: Alexandru Croitor <[email protected]>
  • Loading branch information
lixinwei715 committed Apr 29, 2021
1 parent 2ecd0f4 commit ebf91d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configure.json
Original file line number Diff line number Diff line change
Expand Up @@ -1514,8 +1514,8 @@
},
{
"type": "note",
"condition": "features.thread",
"message": "Using pthreads"
"condition": "features.thread && config.wasm",
"message": "Enable thread support"
},
{
"type": "error",
Expand Down

0 comments on commit ebf91d1

Please sign in to comment.