diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:28:08 +0200 |
| commit | e257664ae65ce5c51c7edac0a1a9ffaba4baea70 (patch) | |
| tree | e215b858aad2f285fdee4d4aeb4498682573119e /src/plugins/canbus/socketcan | |
| parent | 6ba3a215494a829e73e62f5bd73f5b769874267d (diff) | |
| parent | 8cec9f474af2cf654828b5d47b166da7d3c36574 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ib417a3ca5b84519b5eeae6a9368dc3041a41b13b
Diffstat (limited to 'src/plugins/canbus/socketcan')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcan.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro index 6a5504f..a4874b0 100644 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ b/src/plugins/canbus/socketcan/socketcan.pro @@ -1,6 +1,6 @@ TARGET = qtsocketcanbus -QT = core-private serialbus +QT = core serialbus HEADERS += \ socketcanbackend.h |