diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2019-09-04 21:09:22 +0200 |
|---|---|---|
| committer | Andre Hartmann <aha_1980@gmx.de> | 2019-09-06 09:23:05 +0200 |
| commit | 35e033232f8b19fcd3785baf04fec0db546d8015 (patch) | |
| tree | 0d79f0f26dae92d447bca1a47e087a09b65f7f6e | |
| parent | d25ad10a039514516460f8e446ea734baf69fed1 (diff) | |
QCanBusDevice: Undo source-incompatible change
Introduced in eca5edf45a8043
Change-Id: If1586d0b62b0544feee5b07289503966efa0f16d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/serialbus/qcanbusdevice.h | 1 | ||||
| -rw-r--r-- | tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index 476e77e..9b505f9 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -204,7 +204,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QCanBusDevice::Directions) QT_END_NAMESPACE -Q_DECLARE_METATYPE(QCanBusDevice::Filter) Q_DECLARE_METATYPE(QCanBusDevice::Filter::FormatFilter) Q_DECLARE_METATYPE(QList<QCanBusDevice::Filter>) diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp index e0b30f0..61d30c0 100644 --- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp +++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp @@ -44,6 +44,8 @@ #include <memory> +Q_DECLARE_METATYPE(QCanBusDevice::Filter) + class tst_Backend : public QCanBusDevice { Q_OBJECT |