summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2014-11-10 13:57:43 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2014-11-10 16:29:10 +0100
commit6a338d73ba622482d51883f87c642fccd6c7ede1 (patch)
tree89e4fb3903695854c90e268ad327d027a5ba3bcb /share
parent7db9c37b2dc0af696eea2814db0f06559b5a3bdb (diff)
downloadqt-creator-6a338d73ba622482d51883f87c642fccd6c7ede1.tar.gz
JsonWizard: Add .gitignore file to empty qmake projects
Task-number: QTCREATORBUG-3125 Change-Id: I8c6777734224d4f7fff27ce441f75f380460723a Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json5
-rw-r--r--share/qtcreator/templates/wizards/projects/qmake/git.ignore72
2 files changed, 77 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json
index 17d39e79b3..3aaad995a5 100644
--- a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json
@@ -45,6 +45,11 @@
"source": "file.pro",
"target": "%{ProFileName}",
"openAsProject": true
+ },
+ {
+ "source": "../git.ignore",
+ "target": "%{ProjectDirectory}/.gitignore",
+ "condition": "%{JS: ('%{VersionControl}%{IsSubproject}' === 'G.Git') ? 'yes' : ''}"
}
]
}
diff --git a/share/qtcreator/templates/wizards/projects/qmake/git.ignore b/share/qtcreator/templates/wizards/projects/qmake/git.ignore
new file mode 100644
index 0000000000..7b8dd04cc9
--- /dev/null
+++ b/share/qtcreator/templates/wizards/projects/qmake/git.ignore
@@ -0,0 +1,72 @@
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*.so.*
+*_pch.h.cpp
+*_resource.rc
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.res
+*.rc
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.sdf
+*.opensdf
+*.vcxproj
+*vcxproj.*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Python byte code
+*.pyc
+
+# Binaries
+# --------
+*.dll
+*.exe
+