diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
| commit | 943518be292f929ff49a589eaa39f7de8a2a14a1 (patch) | |
| tree | 4d5ae1f4084b7f5286f11076b4256a6588ae4c4b /src/plugins/canbus/canbus.pro | |
| parent | 518606690eb1fa021aaecb8e75c6686c4ebea6cf (diff) | |
| parent | 90be9fc65329509229eb17aef74e400fada58da9 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1
Conflicts:
src/plugins/canbus/canbus.pro
src/plugins/canbus/vectorcan/vectorcanbackend.cpp
Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
Diffstat (limited to 'src/plugins/canbus/canbus.pro')
| -rw-r--r-- | src/plugins/canbus/canbus.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/canbus/canbus.pro b/src/plugins/canbus/canbus.pro index 7d70bb9..37db8a3 100644 --- a/src/plugins/canbus/canbus.pro +++ b/src/plugins/canbus/canbus.pro @@ -6,5 +6,7 @@ qtConfig(socketcan) { SUBDIRS += socketcan } -SUBDIRS += peakcan tinycan -win32:SUBDIRS += systeccan vectorcan +qtConfig(library) { + SUBDIRS += peakcan tinycan + win32:SUBDIRS += systeccan vectorcan +} |