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

Re-enable QmlProjectManager by default

Browse Source 
Acting on user feedback.

This essentially reverts commit 7e8fb3a9e9,
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>
This commit is contained in:
hjk
2015-06-30 14:00:43 +02:00
parent d6da30d77a
commit 1a04e06b45
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
View File

@@ -2,8 +2,8 @@
"version": 1, "version": 1,
"kind": "project", "kind": "project",
"id": "QA.QtQuickUi", "id": "QA.QtQuickUi",
"category": "F.Application", "category": "H.Project",
"trDescription": "Creates a Qt Quick 2 UI 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", "trDisplayName": "Qt Quick UI",
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "../../qmake/qtquickapplication/qml_wizard.png", "icon": "../../qmake/qtquickapplication/qml_wizard.png",

4
share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
View File

@@ -2,8 +2,8 @@
"version": 1, "version": 1,
"kind": "project", "kind": "project",
"id": "QB.QtQuickControlsUi", "id": "QB.QtQuickControlsUi",
"category": "F.Application", "category": "H.Project",
"trDescription": "Creates a Qt Quick 2 UI project using Qt Quick Controls.", "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", "trDisplayName": "Qt Quick Controls UI",
"trDisplayCategory": "Application", "trDisplayCategory": "Application",
"icon": "../../qmake/qtquickapplication/qml_wizard.png", "icon": "../../qmake/qtquickapplication/qml_wizard.png",

1
src/plugins/qmlprojectmanager/QmlProjectManager.json.in
View File

@@ -2,7 +2,6 @@
\"Name\" : \"QmlProjectManager\", \"Name\" : \"QmlProjectManager\",
\"Version\" : \"$$QTCREATOR_VERSION\", \"Version\" : \"$$QTCREATOR_VERSION\",
\"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
\"DisabledByDefault\" : true,
\"Vendor\" : \"The Qt Company Ltd\", \"Vendor\" : \"The Qt Company Ltd\",
\"Copyright\" : \"(C) 2015 The Qt Company Ltd\", \"Copyright\" : \"(C) 2015 The Qt Company Ltd\",
\"License\" : [ \"Commercial Usage\", \"License\" : [ \"Commercial Usage\",