From 34008650dfcc3a228f5984c7e3ad7b08915422c7 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Tue, 19 May 2015 13:04:42 +0200
Subject: [PATCH] Wizards: Make sure wizard ids are unique
Replace existing wizards with new ones of the same id.
Change-Id: Ia17e6a4df5e7c8b647eccbe3bfb13e1c5b2d09e0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
---
share/qtcreator/templates/wizards/files/text/wizard.json | 2 +-
.../projects/qmake/qtquickcontrolsapplication/wizard.json | 2 +-
.../wizards/projects/qmlproject/qtquickapplication/wizard.json | 2 +-
.../projects/qmlproject/qtquickcontrolsapplication/wizard.json | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/templates/wizards/files/text/wizard.json b/share/qtcreator/templates/wizards/files/text/wizard.json
index dc25e3c914..0db3f5df1b 100644
--- a/share/qtcreator/templates/wizards/files/text/wizard.json
+++ b/share/qtcreator/templates/wizards/files/text/wizard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"kind": "file",
- "id": "F.Resource",
+ "id": "F.EmptyText",
"category": "U.General",
"trDescription": "Creates an empty file.",
"trDisplayName": "Empty File",
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
index 9953da9054..389a1d392d 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"kind": "project",
- "id": "U.QtQuickControlsApplication",
+ "id": "V.QtQuickControlsApplication",
"category": "F.Application",
"trDescription": "Creates a deployable Qt Quick 2 application using Qt Quick Controls.",
"trDisplayName": "Qt Quick Controls Application",
diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
index 550ffed700..2fa30a66c9 100644
--- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"kind": "project",
- "id": "QA.QMLB Application",
+ "id": "QA.QtQuickUi",
"category": "F.Application",
"trDescription": "Creates a Qt Quick 2 UI project.",
"trDisplayName": "Qt Quick UI",
diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
index eb59f42451..73c9dda871 100644
--- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"kind": "project",
- "id": "QA.QMLB Application",
+ "id": "QB.QtQuickControlsUi",
"category": "F.Application",
"trDescription": "Creates a Qt Quick 2 UI project using Qt Quick Controls.",
"trDisplayName": "Qt Quick Controls UI",
--
GitLab