From 3996faa9cd7d724ffdd08ec98cff3ffde02d622f Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Mon, 18 Nov 2013 09:56:54 +0100
Subject: [PATCH] Remove unused attribute

Change-Id: I0cc6c5a63afbcab0e937db7230c1a979a306957a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 share/qtcreator/templates/qml/qtquick_1_1/template.xml        | 3 +--
 share/qtcreator/templates/qml/qtquick_2_0/template.xml        | 3 +--
 .../qtcreator/templates/qml/qtquickcontrols_1_0/template.xml  | 3 +--
 src/plugins/qmlprojectmanager/qmlapp.cpp                      | 4 ----
 src/plugins/qmlprojectmanager/qmlapp.h                        | 1 -
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/share/qtcreator/templates/qml/qtquick_1_1/template.xml b/share/qtcreator/templates/qml/qtquick_1_1/template.xml
index ee2868b0af2..6eedaea32c9 100644
--- a/share/qtcreator/templates/qml/qtquick_1_1/template.xml
+++ b/share/qtcreator/templates/qml/qtquick_1_1/template.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="C"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1"
-    id="QB.QML Application for Qt Quick 1.1">
+    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1">
     <displayname>Qt Quick 1.1</displayname>
     <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 project. Requires Qt 4.8 or newer.</description>
 </template>
diff --git a/share/qtcreator/templates/qml/qtquick_2_0/template.xml b/share/qtcreator/templates/qml/qtquick_2_0/template.xml
index b7efc7c355b..14889d0e6b2 100644
--- a/share/qtcreator/templates/qml/qtquick_2_0/template.xml
+++ b/share/qtcreator/templates/qml/qtquick_2_0/template.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="A"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2"
-    id="QB.QML Application for Qt Quick 2.0">
+    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2">
     <displayname>Qt Quick 2.0</displayname>
     <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 project. Requires Qt 5.0 or newer.</description>
 </template>
diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml b/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml
index b76fdfb0260..48a2b441ed3 100644
--- a/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml
+++ b/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="B"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2, QtSupport.Wizards.FeatureQtQuick.Controls"
-    id="QB.QML Application for Qt Quick 2.0">
+    featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2, QtSupport.Wizards.FeatureQtQuick.Controls">
     <displayname>Qt Quick Controls 1.0</displayname>
     <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/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp
index 39fd652911c..3e774f94c36 100644
--- a/src/plugins/qmlprojectmanager/qmlapp.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapp.cpp
@@ -154,7 +154,6 @@ static bool parseTemplateXml(QXmlStreamReader &reader, TemplateInfo *info)
     static const QLatin1String tag_template("template");
     static const QLatin1String tag_displayName("displayname");
     static const QLatin1String tag_description("description");
-    static const QLatin1String attribute_id("id");
     static const QLatin1String attribute_featuresRequired("featuresRequired");
     static const QLatin1String attribute_openEditor("openeditor");
     static const QLatin1String attribute_priority("priority");
@@ -169,9 +168,6 @@ static bool parseTemplateXml(QXmlStreamReader &reader, TemplateInfo *info)
             if (reader.attributes().hasAttribute(attribute_priority))
                 info->priority = reader.attributes().value(attribute_priority).toString();
 
-            if (reader.attributes().hasAttribute(attribute_id))
-                info->wizardId = reader.attributes().value(attribute_id).toString();
-
             if (reader.attributes().hasAttribute(attribute_featuresRequired))
                 info->featuresRequired = reader.attributes().value(attribute_featuresRequired).toString();
 
diff --git a/src/plugins/qmlprojectmanager/qmlapp.h b/src/plugins/qmlprojectmanager/qmlapp.h
index 9dd566689b1..a47bedc6c11 100644
--- a/src/plugins/qmlprojectmanager/qmlapp.h
+++ b/src/plugins/qmlprojectmanager/qmlapp.h
@@ -47,7 +47,6 @@ public:
     QString displayName;
     QString description;
     QString openFile;
-    QString wizardId;
     QString featuresRequired;
     QString priority;
 };