From 1a04e06b45d7cfdbf5c7a960f774f4a8a0ee3ca9 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 30 Jun 2015 14:00:43 +0200 Subject: [PATCH] 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 Reviewed-by: Eike Ziller Reviewed-by: Kai Koehne --- .../projects/qmlproject/qtquickapplication/wizard.json | 4 ++-- .../qmlproject/qtquickcontrolsapplication/wizard.json | 4 ++-- src/plugins/qmlprojectmanager/QmlProjectManager.json.in | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json index 71004c93c82..efc71de1d51 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 c1978acdeaf..9e19f93b925 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", diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in index e0c9da40239..b619ad643da 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in @@ -2,7 +2,6 @@ \"Name\" : \"QmlProjectManager\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", - \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) 2015 The Qt Company Ltd\", \"License\" : [ \"Commercial Usage\",