From b863bd02cda66f6eeb220d173b39d52fb3a8770f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Wed, 13 Nov 2013 13:06:32 +0100
Subject: [PATCH] Simplify descriptions of Qt Quick wizards.

The current template mechanism does not support descriptions with
multiple paragraphs. Work around this by making the descriptions
shorter.

Change-Id: I3980778ce3b022430cc838f2c200f003dae0081c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 share/qtcreator/templates/qtquick/qtquick_1_1/template.xml      | 2 +-
 share/qtcreator/templates/qtquick/qtquick_2_0/template.xml      | 2 +-
 .../templates/qtquick/qtquickcontrols_1_0/template.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
index 78a45b4ba50..c61cb2ac14c 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
@@ -5,5 +5,5 @@
     viewerclassname="QtQuick1ApplicationViewer"
     stubversionminor="24">
     <displayname>Qt Quick 1.1</displayname>
-    <description>Creates a Qt Quick 1 application project that can contain both QML and C++ code and includes a QDeclarativeView. The built-in QML types in the QtQuick 1 namespace allow you to write cross-platform applications with a custom look and feel. Requires Qt 4.8 or newer.</description>
+    <description>Creates a deployable Qt Quick 1 application using the "QtQuick 1.1" import. Requires Qt 4.8 or newer.</description>
 </template>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_0/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_0/template.xml
index b3868c71618..40dac6c4d36 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_0/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquick_2_0/template.xml
@@ -5,5 +5,5 @@
     viewerclassname="QtQuick2ApplicationViewer"
     stubversionminor="5">
     <displayname>Qt Quick 2.0</displayname>
-    <description>Creates a Qt Quick 2 application project that can contain both QML and C++ code and includes a QQuickView. The built-in QML types in the QtQuick 2 namespace allow you to write cross-platform applications with a custom look and feel. Requires Qt 5.0 or newer.</description>
+    <description>Creates a deployable Qt Quick 2 application using the "QtQuick 2.0" import. Requires Qt 5.0 or newer.</description>
 </template>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
index 45b12b8207a..5f25ab86737 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
@@ -5,5 +5,5 @@
     viewerclassname="QtQuick2ControlsApplicationViewer"
     stubversionminor="1">
     <displayname>Qt Quick Controls 1.0</displayname>
-    <description>Creates a Qt Quick 2 application project that can contain both QML and C++ code and includes a QQuickView. Creates a deployable Qt Quick application using Qt Quick Controls. All files and directories that reside in the same directory as the main .qml file are deployed. You can modify the contents of the directory any time before deploying. Requires Qt 5.1 or newer.</description>
+    <description>Creates a deployable Qt Quick 2 application using Qt Quick Controls. Requires Qt 5.1 or newer.</description>
 </template>