feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove unused attribute

Browse Source 
Change-Id: I0cc6c5a63afbcab0e937db7230c1a979a306957a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
jkobus
2013-11-18 09:56:54 +01:00
committed by Jarek Kobus
parent 8fe04ce0ad
commit 3996faa9cd
5 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/templates/qml/qtquick_1_1/template.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="C" <template openeditor="main.qml" priority="C"
featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1">
id="QB.QML Application for Qt Quick 1.1">
<displayname>Qt Quick 1.1</displayname> <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> <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> </template>

3
share/qtcreator/templates/qml/qtquick_2_0/template.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="A" <template openeditor="main.qml" priority="A"
featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2">
id="QB.QML Application for Qt Quick 2.0">
<displayname>Qt Quick 2.0</displayname> <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> <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> </template>

3
share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="B" <template openeditor="main.qml" priority="B"
featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2, QtSupport.Wizards.FeatureQtQuick.Controls" 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 Controls 1.0</displayname> <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> <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> </template>

4
src/plugins/qmlprojectmanager/qmlapp.cpp
View File

@@ -154,7 +154,6 @@ static bool parseTemplateXml(QXmlStreamReader &reader, TemplateInfo *info)
static const QLatin1String tag_template("template"); static const QLatin1String tag_template("template");
static const QLatin1String tag_displayName("displayname"); static const QLatin1String tag_displayName("displayname");
static const QLatin1String tag_description("description"); static const QLatin1String tag_description("description");
static const QLatin1String attribute_id("id");
static const QLatin1String attribute_featuresRequired("featuresRequired"); static const QLatin1String attribute_featuresRequired("featuresRequired");
static const QLatin1String attribute_openEditor("openeditor"); static const QLatin1String attribute_openEditor("openeditor");
static const QLatin1String attribute_priority("priority"); static const QLatin1String attribute_priority("priority");
@@ -169,9 +168,6 @@ static bool parseTemplateXml(QXmlStreamReader &reader, TemplateInfo *info)
if (reader.attributes().hasAttribute(attribute_priority)) if (reader.attributes().hasAttribute(attribute_priority))
info->priority = reader.attributes().value(attribute_priority).toString(); 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)) if (reader.attributes().hasAttribute(attribute_featuresRequired))
info->featuresRequired = reader.attributes().value(attribute_featuresRequired).toString(); info->featuresRequired = reader.attributes().value(attribute_featuresRequired).toString();

1
src/plugins/qmlprojectmanager/qmlapp.h
View File

@@ -47,7 +47,6 @@ public:
QString displayName; QString displayName;
QString description; QString description;
QString openFile; QString openFile;
QString wizardId;
QString featuresRequired; QString featuresRequired;
QString priority; QString priority;
}; };