diff options
| author | hjk <hjk@theqtcompany.com> | 2015-06-30 14:00:43 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-07-02 06:46:46 +0000 |
| commit | 1a04e06b45d7cfdbf5c7a960f774f4a8a0ee3ca9 (patch) | |
| tree | a1f472ddcbbc18aefa932ff39b986f868368e928 /share | |
| parent | d6da30d77aadf53366a28b6cb10c554762a24766 (diff) | |
| download | qt-creator-1a04e06b45d7cfdbf5c7a960f774f4a8a0ee3ca9.tar.gz | |
Re-enable QmlProjectManager by default
Acting on user feedback.
This essentially reverts commit 7e8fb3a9e971e45a26a8b6323171798dea764174,
but demotes the wizards from "Application" to "Project" and adds
a tooltip in the hope to make "accidental" use less likely.
Change-Id: I385bcfc5cdcb9bb3c36f9168a7fc6480f4fc5062
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json | 4 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json index 71004c93c8..efc71de1d5 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json @@ -2,8 +2,8 @@ "version": 1, "kind": "project", "id": "QA.QtQuickUi", - "category": "F.Application", - "trDescription": "Creates a Qt Quick 2 UI project.", + "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", "trDisplayCategory": "Application", "icon": "../../qmake/qtquickapplication/qml_wizard.png", diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json index c1978acdea..9e19f93b92 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json @@ -2,8 +2,8 @@ "version": 1, "kind": "project", "id": "QB.QtQuickControlsUi", - "category": "F.Application", - "trDescription": "Creates a Qt Quick 2 UI project using Qt Quick Controls.", + "category": "H.Project", + "trDescription": "Creates a Qt Quick 2 UI project using Qt Quick Controls 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 Controls Application project instead.", "trDisplayName": "Qt Quick Controls UI", "trDisplayCategory": "Application", "icon": "../../qmake/qtquickapplication/qml_wizard.png", |