##// END OF EJS Templates
Fixed .gitignore to not ignore demo folder
Tero Ahola -
r1120:1549767f00e5
parent child
Show More
@@ -1,270 +1,269
1 # This file is used to ignore files which are generated in the Qt build system
1 # This file is used to ignore files which are generated in the Qt build system
2 # ----------------------------------------------------------------------------
2 # ----------------------------------------------------------------------------
3
3
4 examples/*/*/*
4 examples/*/*/*
5 !examples/*/*/*[.]*
5 !examples/*/*/*[.]*
6 !examples/*/*/README
6 !examples/*/*/README
7 examples/*/*/*[.]app
7 examples/*/*/*[.]app
8 !examples/declarative/*
8 !examples/declarative/*
9 !examples/tutorials/*
9 !examples/tutorials/*
10 !examples/tutorials/*/*
10 !examples/tutorials/*/*
11 !examples/ja_JP/*/*
11 !examples/ja_JP/*/*
12 demos/*/*
13 !demos/spectrum/*
12 !demos/spectrum/*
14 demos/spectrum/bin
13 demos/spectrum/bin
15 !demos/*/*[.]*
14 !demos/*/*[.]*
16 demos/*/*[.]app
15 demos/*/*[.]app
17 !demos/declarative/*
16 !demos/declarative/*
18 config.tests/*/*/*
17 config.tests/*/*/*
19 !config.tests/*/*/*[.]*
18 !config.tests/*/*/*[.]*
20 config.tests/*/*/*[.]app
19 config.tests/*/*/*[.]app
21
20
22 callgrind.out.*
21 callgrind.out.*
23 pcviewer.cfg
22 pcviewer.cfg
24 *~
23 *~
25 *.a
24 *.a
26 *.la
25 *.la
27 *.core
26 *.core
28 *.moc
27 *.moc
29 *.o
28 *.o
30 *.obj
29 *.obj
31 *.orig
30 *.orig
32 *.swp
31 *.swp
33 *.rej
32 *.rej
34 *.so
33 *.so
35 *.pbxuser
34 *.pbxuser
36 *.mode1
35 *.mode1
37 *.mode1v3
36 *.mode1v3
38 *_pch.h.cpp
37 *_pch.h.cpp
39 *_resource.rc
38 *_resource.rc
40 .#*
39 .#*
41 *.*#
40 *.*#
42 core
41 core
43 .qmake.cache
42 .qmake.cache
44 .qmake.vars
43 .qmake.vars
45 *.prl
44 *.prl
46 tags
45 tags
47 .DS_Store
46 .DS_Store
48 *.debug
47 *.debug
49 Makefile*
48 Makefile*
50 !qmake/Makefile.win32*
49 !qmake/Makefile.win32*
51 !qmake/Makefile.unix
50 !qmake/Makefile.unix
52 *.prl
51 *.prl
53 *.app
52 *.app
54 *.pro.user*
53 *.pro.user*
55 *.qmlproject.user*
54 *.qmlproject.user*
56 *.gcov
55 *.gcov
57 bin/Qt*.dll
56 bin/Qt*.dll
58 bin/assistant*
57 bin/assistant*
59 bin/designer*
58 bin/designer*
60 bin/dumpcpp*
59 bin/dumpcpp*
61 bin/idc*
60 bin/idc*
62 bin/linguist*
61 bin/linguist*
63 bin/lrelease*
62 bin/lrelease*
64 bin/lupdate*
63 bin/lupdate*
65 bin/lconvert*
64 bin/lconvert*
66 bin/moc*
65 bin/moc*
67 bin/makeqpf*
66 bin/makeqpf*
68 bin/pixeltool*
67 bin/pixeltool*
69 bin/qmake*
68 bin/qmake*
70 bin/qdoc3*
69 bin/qdoc3*
71 bin/qt3to4*
70 bin/qt3to4*
72 bin/qtdemo*
71 bin/qtdemo*
73 bin/qttracereplay*
72 bin/qttracereplay*
74 bin/rcc*
73 bin/rcc*
75 bin/uic*
74 bin/uic*
76 bin/patternist*
75 bin/patternist*
77 bin/phonon*
76 bin/phonon*
78 bin/qcollectiongenerator*
77 bin/qcollectiongenerator*
79 bin/qdbus*
78 bin/qdbus*
80 bin/qhelpconverter*
79 bin/qhelpconverter*
81 bin/qhelpgenerator*
80 bin/qhelpgenerator*
82 bin/qtconfig*
81 bin/qtconfig*
83 bin/xmlpatterns*
82 bin/xmlpatterns*
84 bin/cetest*
83 bin/cetest*
85 bin/collectiongenerator
84 bin/collectiongenerator
86 bin/helpconverter
85 bin/helpconverter
87 bin/helpgenerator
86 bin/helpgenerator
88 bin/kmap2qmap*
87 bin/kmap2qmap*
89 bin/qlalr*
88 bin/qlalr*
90 bin/qmlconv*
89 bin/qmlconv*
91 bin/qmldebugger*
90 bin/qmldebugger*
92 bin/qml*
91 bin/qml*
93 bin/qttracereplay*
92 bin/qttracereplay*
94 configure.cache
93 configure.cache
95 config.status
94 config.status
96 mkspecs/default
95 mkspecs/default
97 mkspecs/qconfig.pri
96 mkspecs/qconfig.pri
98 moc_*.cpp
97 moc_*.cpp
99 qmake/qmake.exe
98 qmake/qmake.exe
100 qmake/Makefile.bak
99 qmake/Makefile.bak
101 src/corelib/global/qconfig.cpp
100 src/corelib/global/qconfig.cpp
102 src/corelib/global/qconfig.h
101 src/corelib/global/qconfig.h
103 src/corelib/global/qconfig.h.qmake
102 src/corelib/global/qconfig.h.qmake
104 src/tools/uic/qclass_lib_map.h
103 src/tools/uic/qclass_lib_map.h
105 ui_*.h
104 ui_*.h
106 tests/auto/qprocess/test*/*.exe
105 tests/auto/qprocess/test*/*.exe
107 tests/auto/qtcpsocket/stressTest/*.exe
106 tests/auto/qtcpsocket/stressTest/*.exe
108 tests/auto/qprocess/fileWriterProcess/*.exe
107 tests/auto/qprocess/fileWriterProcess/*.exe
109 tests/auto/qmake/testdata/quotedfilenames/*.exe
108 tests/auto/qmake/testdata/quotedfilenames/*.exe
110 tests/auto/compilerwarnings/*.exe
109 tests/auto/compilerwarnings/*.exe
111 tests/auto/qmake/testdata/quotedfilenames/test.cpp
110 tests/auto/qmake/testdata/quotedfilenames/test.cpp
112 tests/auto/qprocess/fileWriterProcess.txt
111 tests/auto/qprocess/fileWriterProcess.txt
113 .com.apple.timemachine.supported
112 .com.apple.timemachine.supported
114 tests/auto/qlibrary/libmylib.so*
113 tests/auto/qlibrary/libmylib.so*
115 tests/auto/qresourceengine/runtime_resource.rcc
114 tests/auto/qresourceengine/runtime_resource.rcc
116 tools/qtestlib/chart/chart*
115 tools/qtestlib/chart/chart*
117 tools/qtestlib/updater/updater*
116 tools/qtestlib/updater/updater*
118 tools/activeqt/testcon/testcon.tlb
117 tools/activeqt/testcon/testcon.tlb
119 translations/*.qm
118 translations/*.qm
120 translations/*_untranslated.ts
119 translations/*_untranslated.ts
121 qrc_*.cpp
120 qrc_*.cpp
122
121
123 # Test generated files
122 # Test generated files
124 QObject.log
123 QObject.log
125 tst_*
124 tst_*
126 !tst_*.*
125 !tst_*.*
127 tst_*.log
126 tst_*.log
128 tst_*.debug
127 tst_*.debug
129 tst_*~
128 tst_*~
130
129
131 # xemacs temporary files
130 # xemacs temporary files
132 *.flc
131 *.flc
133
132
134 # Vim temporary files
133 # Vim temporary files
135 .*.swp
134 .*.swp
136
135
137 # Visual Studio generated files
136 # Visual Studio generated files
138 *.ib_pdb_index
137 *.ib_pdb_index
139 *.idb
138 *.idb
140 *.ilk
139 *.ilk
141 *.pdb
140 *.pdb
142 *.sln
141 *.sln
143 *.suo
142 *.suo
144 *.vcproj
143 *.vcproj
145 *vcproj.*.*.user
144 *vcproj.*.*.user
146 *.ncb
145 *.ncb
147 *.vcxproj
146 *.vcxproj
148 *.vcxproj.filters
147 *.vcxproj.filters
149 *.vcxproj.user
148 *.vcxproj.user
150
149
151 # MinGW generated files
150 # MinGW generated files
152 *.Debug
151 *.Debug
153 *.Release
152 *.Release
154
153
155 # WebKit temp files
154 # WebKit temp files
156 src/3rdparty/webkit/WebCore/mocinclude.tmp
155 src/3rdparty/webkit/WebCore/mocinclude.tmp
157 src/3rdparty/webkit/includes.txt
156 src/3rdparty/webkit/includes.txt
158 src/3rdparty/webkit/includes2.txt
157 src/3rdparty/webkit/includes2.txt
159
158
160 # Symlinks generated by configure
159 # Symlinks generated by configure
161 tools/qvfb/qvfbhdr.h
160 tools/qvfb/qvfbhdr.h
162 tools/qvfb/qlock_p.h
161 tools/qvfb/qlock_p.h
163 tools/qvfb/qlock.cpp
162 tools/qvfb/qlock.cpp
164 tools/qvfb/qwssignalhandler.cpp
163 tools/qvfb/qwssignalhandler.cpp
165 tools/qvfb/qwssignalhandler_p.h
164 tools/qvfb/qwssignalhandler_p.h
166 .DS_Store
165 .DS_Store
167 .pch
166 .pch
168 .rcc
167 .rcc
169 *.app
168 *.app
170 config.status
169 config.status
171 config.tests/unix/cups/cups
170 config.tests/unix/cups/cups
172 config.tests/unix/getaddrinfo/getaddrinfo
171 config.tests/unix/getaddrinfo/getaddrinfo
173 config.tests/unix/getifaddrs/getifaddrs
172 config.tests/unix/getifaddrs/getifaddrs
174 config.tests/unix/iconv/iconv
173 config.tests/unix/iconv/iconv
175 config.tests/unix/ipv6/ipv6
174 config.tests/unix/ipv6/ipv6
176 config.tests/unix/ipv6ifname/ipv6ifname
175 config.tests/unix/ipv6ifname/ipv6ifname
177 config.tests/unix/largefile/largefile
176 config.tests/unix/largefile/largefile
178 config.tests/unix/nis/nis
177 config.tests/unix/nis/nis
179 config.tests/unix/odbc/odbc
178 config.tests/unix/odbc/odbc
180 config.tests/unix/openssl/openssl
179 config.tests/unix/openssl/openssl
181 config.tests/unix/stl/stl
180 config.tests/unix/stl/stl
182 config.tests/unix/zlib/zlib
181 config.tests/unix/zlib/zlib
183 config.tests/unix/3dnow/3dnow
182 config.tests/unix/3dnow/3dnow
184 config.tests/unix/mmx/mmx
183 config.tests/unix/mmx/mmx
185 config.tests/unix/sse/sse
184 config.tests/unix/sse/sse
186 config.tests/unix/sse2/sse2
185 config.tests/unix/sse2/sse2
187
186
188
187
189
188
190 # Directories to ignore
189 # Directories to ignore
191 # ---------------------
190 # ---------------------
192
191
193 debug
192 debug
194 examples/tools/plugandpaint/plugins
193 examples/tools/plugandpaint/plugins
195 include/*
194 include/*
196 include/*/*
195 include/*/*
197 lib/*
196 lib/*
198 !lib/fonts
197 !lib/fonts
199 !lib/README
198 !lib/README
200 plugins/*/*
199 plugins/*/*
201 release
200 release
202 tmp
201 tmp
203 doc-build
202 doc-build
204 doc/html/*
203 doc/html/*
205 tools/qdoc3/doc/html/*
204 tools/qdoc3/doc/html/*
206 doc/qch
205 doc/qch
207 doc-build
206 doc-build
208 .rcc
207 .rcc
209 .pch
208 .pch
210 .metadata
209 .metadata
211 build/*
210 build/*
212 bin/*
211 bin/*
213 coverage/*
212 coverage/*
214
213
215 # Symbian build system generated files
214 # Symbian build system generated files
216 # ---------------------
215 # ---------------------
217
216
218 ABLD.BAT
217 ABLD.BAT
219 bld.inf*
218 bld.inf*
220 *.mmp
219 *.mmp
221 *.mk
220 *.mk
222 *.rss
221 *.rss
223 *.loc
222 *.loc
224 !s60main.rss
223 !s60main.rss
225 *.pkg
224 *.pkg
226 plugin_commonu.def
225 plugin_commonu.def
227 *.qtplugin
226 *.qtplugin
228 *.sis
227 *.sis
229 *.sisx
228 *.sisx
230 *.lst
229 *.lst
231 *.exe
230 *.exe
232 *.mif
231 *.mif
233 *.rsc
232 *.rsc
234 *.sym
233 *.sym
235 *.lib
234 *.lib
236
235
237 # runonphone crash dumps
236 # runonphone crash dumps
238 d_exc_*.txt
237 d_exc_*.txt
239 d_exc_*.stk
238 d_exc_*.stk
240
239
241 # Generated by abldfast.bat from devtools.
240 # Generated by abldfast.bat from devtools.
242 .abldsteps.*
241 .abldsteps.*
243
242
244 # Carbide project files
243 # Carbide project files
245 # ---------------------
244 # ---------------------
246 .project
245 .project
247 .cproject
246 .cproject
248 .make.cache
247 .make.cache
249 *.d
248 *.d
250
249
251 # OSX build files
250 # OSX build files
252 *.xcodeproj
251 *.xcodeproj
253 Info.plist
252 Info.plist
254
253
255 qtc-debugging-helper
254 qtc-debugging-helper
256 qtc-qmldump
255 qtc-qmldump
257 qtc-qmldbg
256 qtc-qmldbg
258
257
259 .pc/
258 .pc/
260
259
261 # INTEGRITY generated files
260 # INTEGRITY generated files
262 *.gpj
261 *.gpj
263 *.int
262 *.int
264 *.ael
263 *.ael
265 *.dla
264 *.dla
266 *.dnm
265 *.dnm
267 *.dep
266 *.dep
268 *.map
267 *.map
269 work
268 work
270
269
General Comments 0
You need to be logged in to leave comments. Login now