Merge pull request #647 from iakov/master

Fix usage of free'd ModelTimer object

Author: mergify[bot]

plugins/robots/interpreters/trikKitInterpreterCommon/src/trikbrick.cpp

@@ -376,8 +376,9 @@ void TrikBrick::wait(int milliseconds)
 
 	QEventLoop loop;
 
-	QScopedPointer<utils::AbstractTimer> t(timeline->produceTimer());
-	connect(t.data(), &utils::AbstractTimer::timeout, &loop, &QEventLoop::quit);
+	auto t = timeline->produceTimer();
+	connect(t, &utils::AbstractTimer::timeout, &loop, &QEventLoop::quit);
+	connect(&loop, &QObject::destroyed, t, &QObject::deleteLater);
 
 	// This one is from brick.reset(), that is called for toolbar Stop button
 	connect(this, &TrikBrick::stopWaiting, &loop, &QEventLoop::quit);

qrtranslations/fr/plugins/robots/trikKitInterpreterCommon_fr.ts

@@ -105,12 +105,12 @@
     </message>
     <message>
         <location line="-30"/>
-        <location line="+285"/>
+        <location line="+286"/>
         <source>Trying to read from file %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
+        <location line="-231"/>
         <source>No configured motor on port: %1</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/ru/plugins/robots/trikKitInterpreterCommon_ru.ts

@@ -165,12 +165,12 @@
     </message>
     <message>
         <location line="-30"/>
-        <location line="+285"/>
+        <location line="+286"/>
         <source>Trying to read from file %1 failed</source>
         <translation>Не удалось открыть файл %1</translation>
     </message>
     <message>
-        <location line="-230"/>
+        <location line="-231"/>
         <source>No configured motor on port: %1</source>
         <translation>Не найден сконфигурированный  мотор на порту: %1</translation>
     </message>