diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:01:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:01:44 +0100 |
| commit | 8b1a6de795523156a5a74dd2a544d866a8beeb53 (patch) | |
| tree | 6d27cd7b1bc036d3d4af0bfef55e3d5ceb78fcb8 /examples/serialbus/can/mainwindow.h | |
| parent | 6e275b20911fc3e5af2a1b972ec3550235250157 (diff) | |
| parent | b63877157c2c9681ced1efbfefe1d2d1debf812e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie5256b216ed3c9d212b3a713c1d46c9275a4d139
Diffstat (limited to 'examples/serialbus/can/mainwindow.h')
| -rw-r--r-- | examples/serialbus/can/mainwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h index 9c3f9ca..2a7bbf0 100644 --- a/examples/serialbus/can/mainwindow.h +++ b/examples/serialbus/can/mainwindow.h @@ -82,6 +82,7 @@ private slots: void sendFrame(const QCanBusFrame &frame) const; void processErrors(QCanBusDevice::CanBusError) const; void connectDevice(); + void busStatus(); void disconnectDevice(); void processFramesWritten(qint64); |