projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc: Enabling Qt QML linking to Qt Quick.
[profile/ivi/qtdeclarative.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
2341712
..
914f9e3
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-106,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_*
@@
-181,6
+179,7
@@
config.tests/unix/sse2/sse2
# ---------------------
debug
# ---------------------
debug
+imports/*
examples/tools/plugandpaint/plugins
include/*
include/*/*
examples/tools/plugandpaint/plugins
include/*
include/*/*
@@
-194,6
+193,8
@@
doc-build
doc/html/*
doc/qch
doc-build
doc/html/*
doc/qch
doc-build
+doc/qtqml
+doc/qtquick
.rcc
.pch
.metadata
.rcc
.pch
.metadata
@@
-256,11
+257,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/compatibility/qtdeclarativeversion.h
src/qml/qtqmlversion.h
tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
src/qml/qtqmlversion.h
tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
-src/declarative/generated/