Revert "McuSuport: Use qsTrId() instead of qsTr in QtMCUs templates"

The id based translation feature is not available on Qt for MCUs 2.5

This reverts commit 8f948c28a9e549077b2a81bb3cb414385e93fcd3.

Task-number: QTCREATORBUG-29940
Change-Id: I0a63e8738e2a0b92319ba53d8b1f1730f8421796
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>

8 files changed, 39 insertions, 29 deletions

diff --git a/src/plugins/mcusupport/mcusupport.qrc b/src/plugins/mcusupport/mcusupport.qrc
index f6e5c151332..dc64ac1ca2f 100644
--- a/src/plugins/mcusupport/mcusupport.qrc
+++ b/src/plugins/mcusupport/mcusupport.qrc
@@ -13,8 +13,8 @@
         <file>wizards/qmlproject/DejaVuSansMono.ttf</file>
         <file>wizards/qmlproject/LICENSE</file>
         <file>wizards/qmlproject/translation.nb_NO.ts</file>
-        <file>wizards/qmlproject/translation.en_US.ts</file>
         <file>wizards/qmlproject/BackendObject.h</file>
+        <file>wizards/qmlproject/main_big.qml.tpl</file>
         <file>wizards/qmlproject/main.qml.tpl</file>
         <file>wizards/qmlproject/project.qmlproject.tpl</file>
         <file>wizards/qmlproject/module.qmlproject.tpl</file>
diff --git a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
index ead4e315a36..ab85861a5ec 100644
--- a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl
@@ -5,7 +5,6 @@ Project {
     // importPaths: [] // Alternative API to ModuleFiles for importing modules.
     // projectRootPath: "." // Optional root path relative to qmlproject file path.
     mainFile: "%{MainQmlFile}" // The application's entrypoint
-    idBasedTranslations: true // Use qsTrId() instead of qsTr()
 
     MCU.Config {
         controlsStyle: "QtQuick.Controls.StyleDefault"
diff --git a/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl b/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
index 5097435e099..44f4788740c 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject/main.qml.tpl
@@ -16,10 +16,9 @@ Rectangle {
 
     CustomButton {
         anchors.centerIn: parent
-        text: qsTrId("hello-world")
+        text: qsTr("Hello world!")
         onClicked: BackendObject.toggle()
     }
 
     BackendObject.onCustomPropertyChanged: Qt.uiLanguage = BackendObject.customProperty ? "en_US" : "nb_NO"
-    Component.onCompleted: Qt.uiLanguage = "en_US"
 }
diff --git a/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl b/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl
new file mode 100644
index 00000000000..60f77144499
--- /dev/null
+++ b/src/plugins/mcusupport/wizards/qmlproject/main_big.qml.tpl
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+import CustomModule
+
+Rectangle {
+     // Component.onCompleted: Qt.uiLanguage = "nb_NO" // Uncomment to change the UI language //TODO: Is this the "official" method of setting ui language?
+
+    Row {
+        visible: CustomObject.customProperty
+        Image {
+            anchors.centerIn: parent
+            id: icon
+            source: "assets/icon.png"
+        }
+        Text {
+            anchors.centerIn: parent
+            font.pixelSize: 28
+            id: title
+            text: " for MCUs"
+        }
+    }
+
+    CustomComponent {
+        anchors.centerIn: parent
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: CustomObject.toggle()
+    }
+}
diff --git a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
index 113cd1f07a7..0c879ccfb0d 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
+++ b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl
@@ -5,7 +5,6 @@ Project {
     // importPaths: ["imports/CustomModule"] // Alternative API for importing modules.
     // projectRootPath: "." // Optional root path relative to qmlproject file path.
     mainFile: "%{MainQmlFile}" // The application's entrypoint
-    idBasedTranslations: true // Use qsTrId() instead of qsTr()
 
     /* Global configuration */
     MCU.Config {
@@ -89,11 +88,8 @@ Project {
 
     /* Translations */
     TranslationFiles {
-        files: [
-            "translations/%{TsFileEn}",
-            "translations/%{TsFileNo}"
-        ]
-        MCU.omitSourceLanguage: true
+        files: ["translations/%{TsFile}"]
+        MCU.omitSourceLanguage: false
     }
 
     FontFiles {
diff --git a/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts b/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts
deleted file mode 100644
index f4f94ed311c..00000000000
--- a/src/plugins/mcusupport/wizards/qmlproject/translation.en_US.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
-<context>
-    <name>%{CorrectedProjectName}</name>
-    <message id="hello-world">
-        <translation>Hello world!</translation>
-    </message>
-</context>
-</TS>
diff --git a/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts b/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
index 10bdd92d377..2cd70a44edd 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
+++ b/src/plugins/mcusupport/wizards/qmlproject/translation.nb_NO.ts
@@ -3,7 +3,9 @@
 <TS version="2.1" language="nb_NO">
 <context>
     <name>%{CorrectedProjectName}</name>
-    <message id="hello-world">
+    <message>
+        <location filename="../%{MainQmlFile}" line="37"/>
+        <source>Hello world!</source>
         <translation>Hallo verden!</translation>
     </message>
 </context>
diff --git a/src/plugins/mcusupport/wizards/qmlproject/wizard.json b/src/plugins/mcusupport/wizards/qmlproject/wizard.json
index 8375cfb212b..4a5f582d432 100644
--- a/src/plugins/mcusupport/wizards/qmlproject/wizard.json
+++ b/src/plugins/mcusupport/wizards/qmlproject/wizard.json
@@ -21,8 +21,7 @@
         { "key": "ModuleFile", "value": "CustomModule.qmlproject"},
         { "key": "QmlComponent", "value": "CustomButton.qml"},
         { "key": "InterfaceFile", "value": "BackendObject.h"},
-        { "key": "TsFileEn", "value": "%{CorrectedProjectName}.en_US.ts"},
-        { "key": "TsFileNo", "value": "%{CorrectedProjectName}.nb_NO.ts"}
+        { "key": "TsFile", "value": "%{CorrectedProjectName}.nb_NO.ts"}
     ],
 
     "pages":
@@ -104,12 +103,7 @@
                 },
                 {
                     "source": "translation.nb_NO.ts",
-                    "target": "%{QmlProjectDirectory}/translations/%{TsFileNo}",
-                    "openInEditor": false
-                },
-                {
-                    "source": "translation.en_US.ts",
-                    "target": "%{QmlProjectDirectory}/translations/%{TsFileEn}",
+                    "target": "%{QmlProjectDirectory}/translations/%{TsFile}",
                     "openInEditor": false
                 },
                 {