diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:02:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:02:27 +0100 |
| commit | 7e1aea2a721e4eb0368be03563362d57469a76a6 (patch) | |
| tree | 0306b756c88f3112fcd23c811234aee00a0e07e0 /src/plugins/canbus | |
| parent | 4c77252b559c24d1c129233a89e3c6f17b1376c2 (diff) | |
| parent | df3487b7609fdbe55fff9d116f95d68567f11393 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I3b0f7e3ef4d3201f3ffcac458fc691296dabf12a
Diffstat (limited to 'src/plugins/canbus')
| -rw-r--r-- | src/plugins/canbus/passthrucan/passthrucan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/peakcan/peakcan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/systeccan/systeccan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan.pro | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/virtualcan/virtualcan.pro | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/canbus/passthrucan/passthrucan.pro b/src/plugins/canbus/passthrucan/passthrucan.pro index 96ed090..cb9bdc5 100644 --- a/src/plugins/canbus/passthrucan/passthrucan.pro +++ b/src/plugins/canbus/passthrucan/passthrucan.pro @@ -16,6 +16,5 @@ HEADERS += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = PassThruCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/peakcan/peakcan.pro b/src/plugins/canbus/peakcan/peakcan.pro index 9f9a2de..d5b809c 100644 --- a/src/plugins/canbus/peakcan/peakcan.pro +++ b/src/plugins/canbus/peakcan/peakcan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = PeakCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro index a4874b0..20a2c5d 100644 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ b/src/plugins/canbus/socketcan/socketcan.pro @@ -12,6 +12,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = SocketCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/systeccan/systeccan.pro b/src/plugins/canbus/systeccan/systeccan.pro index f1c2180..3520325 100644 --- a/src/plugins/canbus/systeccan/systeccan.pro +++ b/src/plugins/canbus/systeccan/systeccan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = SystecCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/tinycan/tinycan.pro b/src/plugins/canbus/tinycan/tinycan.pro index c0aa948..c450bb9 100644 --- a/src/plugins/canbus/tinycan/tinycan.pro +++ b/src/plugins/canbus/tinycan/tinycan.pro @@ -13,6 +13,5 @@ SOURCES += main.cpp \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = TinyCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/vectorcan/vectorcan.pro b/src/plugins/canbus/vectorcan/vectorcan.pro index b22492b..847f2aa 100644 --- a/src/plugins/canbus/vectorcan/vectorcan.pro +++ b/src/plugins/canbus/vectorcan/vectorcan.pro @@ -14,6 +14,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = VectorCanBusPlugin load(qt_plugin) diff --git a/src/plugins/canbus/virtualcan/virtualcan.pro b/src/plugins/canbus/virtualcan/virtualcan.pro index 7b5504d..d719f70 100644 --- a/src/plugins/canbus/virtualcan/virtualcan.pro +++ b/src/plugins/canbus/virtualcan/virtualcan.pro @@ -12,6 +12,5 @@ SOURCES += \ DISTFILES = plugin.json PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = serialbus PLUGIN_CLASS_NAME = VirtualCanBusPlugin load(qt_plugin) |