JsonWizards: Move .gitignore template file

Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

JsonWizards: Move .gitignore template file
Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
d7b70000 · Tobias Hunger · dbec2d21 · d7b70000 · d7b70000 · d7b70000
Commit d7b70000 authored May 20, 2015 by Tobias Hunger
7 changed files
--- a/share/qtcreator/templates/wizards/projects/qmake/git.ignore
+++ b/share/qtcreator/templates/wizards/projects/qmake/git.ignore
--- 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' )}"
                }

--- 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'}"
                }

--- 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'}"
                }
            ]

--- 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'}"
                }

--- 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'}"
                }

--- 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'}"
                }