projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add maroon demo
[profile/ivi/qtdeclarative.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
e1bf85a
..
9709e29
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,20
+1,6
@@
# This file is used to ignore files which are generated in the Qt build system
# ----------------------------------------------------------------------------
# This file is used to ignore files which are generated in the Qt build system
# ----------------------------------------------------------------------------
-examples/*/*/*
-!examples/*/*/*[.]*
-!examples/*/*/README
-examples/*/*/*[.]app
-!examples/declarative/*
-!examples/tutorials/*
-!examples/tutorials/*/*
-!examples/ja_JP/*/*
-demos/*/*
-!demos/spectrum/*
-demos/spectrum/bin
-!demos/*/*[.]*
-demos/*/*[.]app
-!demos/declarative/*
config.tests/*/*/*
!config.tests/*/*/*[.]*
config.tests/*/*/*[.]app
config.tests/*/*/*
!config.tests/*/*/*[.]*
config.tests/*/*/*[.]app
@@
-120,8
+106,6
@@
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
translations/*_untranslated.ts
qrc_*.cpp
-src/declarative/qtdeclarativeversion.h
-
# Test generated files
QObject.log
tst_*
# Test generated files
QObject.log
tst_*
@@
-141,6
+125,8
@@
tst_*~
*.idb
*.ilk
*.pdb
*.idb
*.ilk
*.pdb
+*.dll
+*.exp
*.sln
*.suo
*.vcproj
*.sln
*.suo
*.vcproj
@@
-193,6
+179,7
@@
config.tests/unix/sse2/sse2
# ---------------------
debug
# ---------------------
debug
+imports/*
examples/tools/plugandpaint/plugins
include/*
include/*/*
examples/tools/plugandpaint/plugins
include/*
include/*/*
@@
-268,9
+255,9
@@
src/qmltest/qtquicktestversion.h
src/qtquick1/qtquick1version.h
src/qmldevtools/qtqmldevtoolsversion.h
src/quick/qtquickversion.h
src/qtquick1/qtquick1version.h
src/qmldevtools/qtqmldevtoolsversion.h
src/quick/qtquickversion.h
+src/qml/qtqmlversion.h
tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
-src/declarative/generated/
\ No newline at end of file