From c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 30 Apr 2019 10:40:02 +0200 Subject: Fix shadow build qtserialbus QtSerialBus requires QtSerialPort for its serial modbus feature. If QtSerialPort is disabled the serial feature in QtSerialBus is disabled. Integrity is one of the platforms where QtSerialPort is not supported and therefore the serial modbus classes are removed. The removal of QtSerialPort is done via qtserialport.pro. Unfortunately during configure execution this project file is not considered. The configure script only considers configure.json files to determine whether a module is built/supported on a particular platform. Consequently the build process fails to build QtSerialBus. The fix is to copy the project conditions to QtSerialPort's configure.json. Fixes: QTBUG-75279 Change-Id: I3796052de6c0622c334218e07ca4eab4134c9302 Reviewed-by: Joerg Bornemann --- configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.json b/configure.json index b42c0ba..1685700 100644 --- a/configure.json +++ b/configure.json @@ -1,3 +1,4 @@ { - "module": "serialport" + "module": "serialport", + "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm" } -- cgit v1.2.1