diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-10-16 13:26:01 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-11-07 08:33:12 +0000 |
| commit | 4c77252b559c24d1c129233a89e3c6f17b1376c2 (patch) | |
| tree | 837b1c85a9cf0bd3daf9bc7f9cd6e851dac2d7f8 /tests | |
| parent | d34ae8f61fa92ef31225cede984f07a8083e50fb (diff) | |
Remove hard QtSerialPort dependency from QtSerialBus
Task-number: QTBUG-70360
Change-Id: I511e368e227a46f9eba178612c8b106f5930ee49
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 7 | ||||
| -rw-r--r-- | tests/auto/qmodbusserver/tst_qmodbusserver.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2542d65..268fc74 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -11,8 +11,11 @@ SUBDIRS += cmake \ qmodbusserver \ qmodbuscommevent \ qmodbusadu \ - qmodbusdeviceidentification \ - qmodbusrtuserialmaster + qmodbusdeviceidentification + +QT_FOR_CONFIG += serialbus + +qtConfig(modbus-serialport): SUBDIRS += qmodbusrtuserialmaster qcanbus.depends += plugins qcanbusdevice.depends += plugins diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp index 6fe284d..ad33337 100644 --- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp +++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp @@ -35,7 +35,9 @@ ****************************************************************************/ #include <QtSerialBus/qmodbusserver.h> +#if QT_CONFIG(modbus_serialport) #include <QtSerialBus/qmodbusrtuserialslave.h> +#endif #include <QtSerialBus/qmodbustcpserver.h> #include <QtSerialBus/qmodbusdeviceidentification.h> @@ -90,7 +92,9 @@ private slots: void testServerAddress() { QCOMPARE(QModbusTcpServer().serverAddress(), 0xff); +#if QT_CONFIG(modbus_serialport) QCOMPARE(QModbusRtuSerialSlave().serverAddress(), 1); +#endif } void testProcessRequestReadWriteSingleMultipleCoils() |