From d7b70000ac2193e9df0a81140ede7c99a86efb45 Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@theqtcompany.com> Date: Wed, 20 May 2015 10:13:40 +0200 Subject: [PATCH] JsonWizards: Move .gitignore template file Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> --- .../templates/wizards/projects/{qmake => }/git.ignore | 0 .../templates/wizards/projects/qmake/consoleapp/wizard.json | 2 +- .../templates/wizards/projects/qmake/empty/wizard.json | 2 +- .../wizards/projects/qmake/qtquickapplication/wizard.json | 4 ++-- .../projects/qmake/qtquickcontrolsapplication/wizard.json | 2 +- .../projects/qmlproject/qtquickapplication/wizard.json | 2 +- .../qmlproject/qtquickcontrolsapplication/wizard.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename share/qtcreator/templates/wizards/projects/{qmake => }/git.ignore (100%) diff --git a/share/qtcreator/templates/wizards/projects/qmake/git.ignore b/share/qtcreator/templates/wizards/projects/git.ignore similarity index 100% rename from share/qtcreator/templates/wizards/projects/qmake/git.ignore rename to share/qtcreator/templates/wizards/projects/git.ignore diff --git a/share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json index 87307f634d..5b716e85a6 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json @@ -54,7 +54,7 @@ "openInEditor": true }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": ".gitignore", "condition": "%{JS: ( %{IsTopLevelProject} && '%{VersionControl}' === 'G.Git' )}" } diff --git a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json index 23519cb616..d033d2a81f 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json @@ -48,7 +48,7 @@ "openAsProject": true }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": "%{ProjectDirectory}/.gitignore", "condition": "%{JS: %{IsTopLevelProject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json index f7105d69ec..2c84b9383a 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json @@ -122,8 +122,8 @@ "target": "%{ProjectDirectory}/deployment.pri" }, { - "source": "../git.ignore", - "target": "%{ProjectDirectory}/.gitignore", + "source": "../../git.ignore", + "target": ".gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } ] diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json index 389a1d392d..66b29eef78 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json @@ -141,7 +141,7 @@ "target": "%{ProjectDirectory}/deployment.pri" }, { - "source": "../git.ignore", + "source": "../../git.ignore", "target": "%{ProjectDirectory}/.gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json index 2fa30a66c9..5fc6f2a049 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json @@ -107,7 +107,7 @@ "condition": "%{QmlUISplit}" }, { - "source": "../../qmake/git.ignore", + "source": "../../git.ignore", "target": "%{ProjectDirectory}/.gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json index 73c9dda871..65ecefc71f 100644 --- a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json @@ -115,7 +115,7 @@ "condition": "%{QmlUISplit}" }, { - "source": "../../qmake/git.ignore", + "source": "../../git.ignore", "target": "%{ProjectDirectory}/.gitignore", "condition": "%{JS: !%{IsSubproject} && '%{VersionControl}' === 'G.Git'}" } -- GitLab