diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:00:09 +0200 |
| commit | 0cd28b7162ccc135749ffce8b082641406c82a61 (patch) | |
| tree | 6d5ea5a3da233344ed57181a50a101ee5c9b0ef0 | |
| parent | e163199a2ff396de0a2395a8d4be7bdf443e682c (diff) | |
| parent | a49336c78a0b610b2dff25ecc1f292bdeefbfda7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie9901b3993fc8f7d3c3f7f09763db6843e6cb514
| -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 |