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

Change-Id: I98f937cc6de5a25862e7c5e37454e318739ea019

1 files changed, 10 insertions, 1 deletions

diff --git a/examples/opcua/waterpump/waterpump-qmlcpp/main.cpp b/examples/opcua/waterpump/waterpump-qmlcpp/main.cpp
index fb22c3d..35ec80a 100644
--- a/examples/opcua/waterpump/waterpump-qmlcpp/main.cpp
+++ b/examples/opcua/waterpump/waterpump-qmlcpp/main.cpp
@@ -93,5 +93,14 @@ int main(int argc, char *argv[])
     if (engine.rootObjects().isEmpty())
         return EXIT_FAILURE;
 
-    return app.exec();
+    const int exitCode = QCoreApplication::exec();
+    if (serverProcess.state() == QProcess::Running) {
+#ifndef Q_OS_WIN
+        serverProcess.terminate();
+#else
+        serverProcess.kill();
+#endif
+        serverProcess.waitForFinished();
+    }
+    return exitCode;
 }