From 13a1f8686c9fb705efa24207cfdee4b783e53c49 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 6 Sep 2017 10:11:03 +0200 Subject: [PATCH] Wizard: Fix Qt Quick Application wizards They had been moved in sub directories and referencing of the git.ignore file was not adjusted accordingly. Task-number: QTCREATORBUG-18842 Change-Id: Id5f720015e94cb581d6b6337080de0c35c90e232 Reviewed-by: Robert Loehning --- .../wizards/projects/qtquickapplication/canvas3d/wizard.json | 2 +- .../wizards/projects/qtquickapplication/empty/wizard.json | 2 +- .../wizards/projects/qtquickapplication/scroll/wizard.json | 2 +- .../wizards/projects/qtquickapplication/stack/wizard.json | 2 +- .../wizards/projects/qtquickapplication/swipe/wizard.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json index 5a6f0a4a38a..13a05271cb5 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json @@ -200,7 +200,7 @@ "source": "qml.qrc" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 521d046e933..1cd0b7d8208 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -186,7 +186,7 @@ "source": "qml.qrc" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json index 7358a6769f5..b915b2ff042 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json @@ -242,7 +242,7 @@ "source": "qml.qrc" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json index 268f2782cc8..1430fce2812 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json @@ -271,7 +271,7 @@ "source": "qml.qrc" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json index 6c58db3f531..9d4287314c3 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json @@ -267,7 +267,7 @@ "source": "qml.qrc" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" }