diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-23 10:58:52 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-23 12:49:19 +0000 |
commit | ceda8fb85392543583144eee476b16f7595c3a69 (patch) | |
tree | b668747e86805061cac775ba114545090866d258 | |
parent | d3c6cd6fde5281f3810568cb305e18720e7c42d9 (diff) |
Don't print the socketcan warnings on non-Linux systems
and a minor doc fix in the same file
Task-number: QTBUG-57213
Change-Id: I4171882a8498cd865ad5c6fdf9e96e8db27c12d2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r-- | src/serialbus/configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serialbus/configure.json b/src/serialbus/configure.json index 6e00230..d640f57 100644 --- a/src/serialbus/configure.json +++ b/src/serialbus/configure.json @@ -31,12 +31,12 @@ "report": [ { "type": "note", - "condition": "!features.socketcan", - "message": "QtSerialBus: Cannot find linux.can.h and linux/can/raw.h Linux headers for socketCAN support." + "condition": "config.linux && !features.socketcan", + "message": "QtSerialBus: Cannot find linux/can.h and linux/can/raw.h Linux headers for socketCAN support." }, { "type": "note", - "condition": "features.socketcan && !features.socketcan_fd", + "condition": "config.linux && features.socketcan && !features.socketcan_fd", "message": "QtSerialBus: Newer kernel needed for flexible data-rate frame support (canfd_frame)." } ], |