diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:28 +0200 |
| commit | d98db4c1bd78d2bd89402d06c8de64cedaf59fdf (patch) | |
| tree | cb9fc53d2eb0446b23c81b094d1bc63ea3b6080c /tests | |
| parent | fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e (diff) | |
| parent | c60080a13038056e956f11205f3f883d551e2fc2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I884ade0e33e4533880c2e86f07b8f747bebfa1ba
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 268fc74..c9e958a 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += cmake \ qcanbusframe \ - qcanbus \ qcanbusdevice \ qmodbusdataunit \ qmodbusreply \ @@ -17,6 +16,8 @@ QT_FOR_CONFIG += serialbus qtConfig(modbus-serialport): SUBDIRS += qmodbusrtuserialmaster +!android: SUBDIRS += qcanbus + qcanbus.depends += plugins qcanbusdevice.depends += plugins |