Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: If9538dcb73fae46ad5206bc88da1bdc7bfb7922a

2 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index 83d2480..301e738 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -52,17 +52,18 @@ DummyBackend::DummyBackend() :
 
         enqueueReceivedFrames({dummyFrame});
     });
-    simulateReceivingTimer->start(1000);
 }
 
 bool DummyBackend::open()
 {
+    simulateReceivingTimer->start(1000);
     setState(QCanBusDevice::ConnectedState);
     return true;
 }
 
 void DummyBackend::close()
 {
+    simulateReceivingTimer->stop();
     setState(QCanBusDevice::UnconnectedState);
 }
 
diff --git a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
index 4d7d9c0..99f7bcd 100644
--- a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
+++ b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
@@ -52,17 +52,18 @@ DummyBackendV1::DummyBackendV1() :
 
         enqueueReceivedFrames({dummyFrame});
     });
-    simulateReceivingTimer->start(1000);
 }
 
 bool DummyBackendV1::open()
 {
+    simulateReceivingTimer->start(1000);
     setState(QCanBusDevice::ConnectedState);
     return true;
 }
 
 void DummyBackendV1::close()
 {
+    simulateReceivingTimer->stop();
     setState(QCanBusDevice::UnconnectedState);
 }