summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2017-02-23 12:58:40 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2017-02-28 09:32:52 +0000
commit569cdadebc1c1441e16c2835ce2a9902fee1da08 (patch)
treeb8833659a9d5bded604b69478c3648397eab3e25 /share
parent7c29ae462be583fa4a1ce31183ab728372b8f6ef (diff)
downloadqt-creator-569cdadebc1c1441e16c2835ce2a9902fee1da08.tar.gz
Wizards: Fix wizard for .qmltypes
The wizard got forgotten during some cleanup. I changed the name and description to emphasize prototyping. Task-number: QTCREATORBUG-17771 Task-number: QTCREATORBUG-17708 Change-Id: I1d46737aba40abf3cd13effc50991cdb789980e6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject (renamed from share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/app.qmlproject)0
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json (renamed from share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json)12
2 files changed, 6 insertions, 6 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/app.qmlproject b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject
index c6519187e5..c6519187e5 100644
--- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/app.qmlproject
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject
diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 53c41b8227..65352d67fa 100644
--- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -3,10 +3,10 @@
"supportedProjectTypes": [ "QmlProjectManager.QmlProject" ],
"id": "QA.QtQuickUi",
"category": "H.Project",
- "trDescription": "Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment such as qmlscene set up. Consider using a Qt Quick Application project instead.",
- "trDisplayName": "Qt Quick UI",
+ "trDescription": "Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment such as qmlscene set up.\n\nUse this only if you are prototyping. You cannot create a full application with this. Consider using a Qt Quick Application project instead.",
+ "trDisplayName": "Qt Quick UI Prototype",
"trDisplayCategory": "Other Project",
- "icon": "../../qtquickapplication/qml_wizard.png",
+ "icon": "../qtquickapplication/qml_wizard.png",
"enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
@@ -123,17 +123,17 @@
"openAsProject": true
},
{
- "source": "../../qtquickapplication/main.qml.tpl",
+ "source": "../qtquickapplication/main.qml.tpl",
"target": "%{ProjectDirectory}/%{MainQmlFileName}",
"openInEditor": true
},
{
- "source": "../../qtquickapplication/MainForm.ui.qml.tpl",
+ "source": "../qtquickapplication/MainForm.ui.qml.tpl",
"target": "%{ProjectDirectory}/MainForm.ui.qml",
"condition": "%{IsUiFileInUse}"
},
{
- "source": "../../git.ignore",
+ "source": "../git.ignore",
"target": "%{ProjectDirectory}/.gitignore",
"condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}"
}