summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/serialbus/qcanbusdeviceinfo.h1
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.cpp5
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.h2
-rw-r--r--tests/auto/plugins/genericcanbus/main.cpp6
4 files changed, 8 insertions, 6 deletions
diff --git a/src/serialbus/qcanbusdeviceinfo.h b/src/serialbus/qcanbusdeviceinfo.h
index fb79f6d..b21a4b3 100644
--- a/src/serialbus/qcanbusdeviceinfo.h
+++ b/src/serialbus/qcanbusdeviceinfo.h
@@ -72,7 +72,6 @@ public:
private:
friend class QCanBusDevice;
- friend class GenericBusPlugin;
explicit QCanBusDeviceInfo(QCanBusDeviceInfoPrivate &dd);
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index acfa520..9f3d0f0 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -84,4 +84,9 @@ QString DummyBackend::interpretErrorFrame(const QCanBusFrame &/*errorFrame*/)
return QString();
}
+QList<QCanBusDeviceInfo> DummyBackend::interfaces()
+{
+ return {createDeviceInfo(QStringLiteral("can0"), true, true)};
+}
+
QT_END_NAMESPACE
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h
index 3142181..e8d27f5 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.h
+++ b/tests/auto/plugins/genericcanbus/dummybackend.h
@@ -56,6 +56,8 @@ public:
QString interpretErrorFrame(const QCanBusFrame &) override;
+ static QList<QCanBusDeviceInfo> interfaces();
+
public Q_SLOTS:
void sendMessage();
diff --git a/tests/auto/plugins/genericcanbus/main.cpp b/tests/auto/plugins/genericcanbus/main.cpp
index 46b21ac..dc687aa 100644
--- a/tests/auto/plugins/genericcanbus/main.cpp
+++ b/tests/auto/plugins/genericcanbus/main.cpp
@@ -55,11 +55,7 @@ public:
{
Q_UNUSED(errorMessage);
- QCanBusDeviceInfoPrivate info;
- info.name = QStringLiteral("can0");
- info.hasFlexibleDataRate = true;
- info.isVirtual = true;
- return { QCanBusDeviceInfo(info) };
+ return DummyBackend::interfaces();
}
QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const override