diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 13:11:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 13:11:24 +0200 |
| commit | 086489d59576fec04e41de7d583ab23804bacd19 (patch) | |
| tree | 6297ca39f78703e92b87ce50ebb43706182fa69c /src/serialbus/qcanbusdevice.h | |
| parent | 3f8eb3be91641f9dba597e4421f9bbf50c5c161e (diff) | |
| parent | a69c84909c6fdc8cd9f8bafdf4ad4575ec634a4a (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iab1b4ac1c44d161a91f7f51cd0da4fc4a674964d
Diffstat (limited to 'src/serialbus/qcanbusdevice.h')
| -rw-r--r-- | src/serialbus/qcanbusdevice.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index 973619b..6a015af 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -97,8 +97,7 @@ public: explicit QCanBusDevice(QObject *parent = nullptr); - virtual void setConfigurationParameter(int key, - const QVariant &value); + virtual void setConfigurationParameter(int key, const QVariant &value); QVariant configurationParameter(int key) const; QVector<int> configurationKeys() const; |