diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-04-30 10:40:02 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-04-30 10:43:48 +0000 |
| commit | c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 (patch) | |
| tree | 7f498c3d1fc8a5e85157cb46996cf3c7bd9cc43e | |
| parent | 313ad3f5ae210db495854bcbd92c70e0732461fb (diff) | |
| download | qtserialport-c1766c64f9f76c075aa1f1723f193bcbfd5e79b2.tar.gz | |
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 <joerg.bornemann@qt.io>
| -rw-r--r-- | configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
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" } |