From f14892d13a4b29a7f560f640ed242b00c41e0575 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 26 Jun 2013 12:39:20 +0200
Subject: [PATCH] Wizards: remove escaped HMTL
Linguist seems to escape the escaped HTML twice.
This breaks translations.
Task-number: QTCREATORBUG-8923
Change-Id: I820b89d7c8e140115dc8b2cf8ef28db49cfb7102
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
share/qtcreator/templates/qml/qtquick1_1/template.xml | 2 +-
share/qtcreator/templates/qml/qtquick2/template.xml | 2 +-
share/qtcreator/templates/qml/qtquickcontrols/template.xml | 2 +-
share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml | 2 +-
share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/share/qtcreator/templates/qml/qtquick1_1/template.xml b/share/qtcreator/templates/qml/qtquick1_1/template.xml
index 236ea30d251..62df5ffa60a 100644
--- a/share/qtcreator/templates/qml/qtquick1_1/template.xml
+++ b/share/qtcreator/templates/qml/qtquick1_1/template.xml
@@ -4,5 +4,5 @@
id="QB.QML Application for Qt Quick 1.1">
<displayname>Qt Quick 1 UI</displayname>
<displayname xml:lang="de">Qt Quick 1 UI</displayname>
- <description>Creates a Qt Quick 1 UI project with a single QML file that contains the main view.<br/>You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.<br/><br/>Requires <b>Qt 4.8</b> or newer.</description>
+ <description>Creates a Qt Quick 1 UI project with a single QML file that contains the main view. You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects. Requires Qt 4.8 or newer.</description>
</template>
diff --git a/share/qtcreator/templates/qml/qtquick2/template.xml b/share/qtcreator/templates/qml/qtquick2/template.xml
index 97c8d70b806..793a37a8f85 100644
--- a/share/qtcreator/templates/qml/qtquick2/template.xml
+++ b/share/qtcreator/templates/qml/qtquick2/template.xml
@@ -4,5 +4,5 @@
id="QB.QML Application for Qt Quick 2.0">
<displayname>Qt Quick 2 UI</displayname>
<displayname xml:lang="de">Qt Quick 2 UI</displayname>
- <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view.<br/>You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.<br/><br/>Requires <b>Qt 5.0</b> or newer.</description>
+ <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects. Requires Qt 5.0 or newer.</description>
</template>
diff --git a/share/qtcreator/templates/qml/qtquickcontrols/template.xml b/share/qtcreator/templates/qml/qtquickcontrols/template.xml
index aea726ab21f..b8d0eed3fae 100644
--- a/share/qtcreator/templates/qml/qtquickcontrols/template.xml
+++ b/share/qtcreator/templates/qml/qtquickcontrols/template.xml
@@ -3,5 +3,5 @@
featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2, QtSupport.Wizards.FeatureQtQuick.Controls"
id="QB.QML Application for Qt Quick 2.0">
<displayname>Qt Quick 2 UI with Controls</displayname>
- <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view and uses Qt Quick Controls.<br/>You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. This project requires that you have installed Qt Quick Controls for your Qt version.<br/><br/>Requires <b>Qt 5.1</b> or newer.</description>
+ <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view and uses Qt Quick Controls. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. This project requires that you have installed Qt Quick Controls for your Qt version. Requires Qt 5.1 or newer.</description>
</template>
diff --git a/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml b/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml
index a38f4125a9e..ce311f620e3 100644
--- a/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml
@@ -39,7 +39,7 @@ leave room for the Qt 4 target page.
id="QtQuick1ExtensionPlugin" category="G.Libraries"
featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.1">
<icon>lib.png</icon>
- <description>Creates a C++ plugin to load extensions dynamically into applications using the QDeclarativeEngine class.<br><br>Requires <b>Qt 4.7.0</b> or newer.</description>
+ <description>Creates a C++ plugin to load extensions dynamically into applications using the QDeclarativeEngine class. Requires Qt 4.7.0 or newer.</description>
<displayname>Qt Quick 1 Extension Plugin</displayname>
<displaycategory>Libraries</displaycategory>
<files>
diff --git a/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml b/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml
index 613e837c101..16c624d21ab 100644
--- a/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml
@@ -39,7 +39,7 @@ leave room for the Qt 4 target page.
id="QtQuick2ExtensionPlugin" category="G.Libraries"
featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.2">
<icon>lib.png</icon>
- <description>Creates a C++ plugin to load extensions dynamically into applications using the QQmlEngine class.<br><br>Requires <b>Qt 5.0</b> or newer.</description>
+ <description>Creates a C++ plugin to load extensions dynamically into applications using the QQmlEngine class. Requires Qt 5.0 or newer.</description>
<displayname>Qt Quick 2 Extension Plugin</displayname>
<displaycategory>Libraries</displaycategory>
<files>
--
GitLab