Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/tools/uic/baseline/controller.ui.h b/tests/auto/tools/uic/baseline/controller.ui.h
index 72b0956472..3ebfad187f 100644
--- a/tests/auto/tools/uic/baseline/controller.ui.h
+++ b/tests/auto/tools/uic/baseline/controller.ui.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'controller.ui'
 **
-** Created by: Qt User Interface Compiler version 5.0.0
+** Created by: Qt User Interface Compiler version 5.12.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
@@ -75,12 +75,12 @@ public:
 
     void retranslateUi(QWidget *Controller)
     {
-        Controller->setWindowTitle(QApplication::translate("Controller", "Controller", nullptr));
-        label->setText(QApplication::translate("Controller", "Controller", nullptr));
-        decelerate->setText(QApplication::translate("Controller", "Decelerate", nullptr));
-        accelerate->setText(QApplication::translate("Controller", "Accelerate", nullptr));
-        right->setText(QApplication::translate("Controller", "Right", nullptr));
-        left->setText(QApplication::translate("Controller", "Left", nullptr));
+        Controller->setWindowTitle(QCoreApplication::translate("Controller", "Controller", nullptr));
+        label->setText(QCoreApplication::translate("Controller", "Controller", nullptr));
+        decelerate->setText(QCoreApplication::translate("Controller", "Decelerate", nullptr));
+        accelerate->setText(QCoreApplication::translate("Controller", "Accelerate", nullptr));
+        right->setText(QCoreApplication::translate("Controller", "Right", nullptr));
+        left->setText(QCoreApplication::translate("Controller", "Left", nullptr));
     } // retranslateUi
 
 };