Doc: Enabling Qt QML linking to Qt Quick.

[profile/ivi/qtdeclarative.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021ff2a..914f9e3 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
 # ----------------------------------------------------------------------------
 
-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
@@ -114,13 +100,12 @@ tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
 tools/qtestlib/chart/chart*
 tools/qtestlib/updater/updater*
+tools/qmltestrunner/qmltestrunner
 tools/activeqt/testcon/testcon.tlb
 translations/*.qm
 translations/*_untranslated.ts
 qrc_*.cpp
 
-src/declarative/qtdeclarativeversion.h
-
 # Test generated files
 QObject.log
 tst_*
@@ -140,6 +125,8 @@ tst_*~
 *.idb
 *.ilk
 *.pdb
+*.dll
+*.exp
 *.sln
 *.suo
 *.vcproj
@@ -192,6 +179,7 @@ config.tests/unix/sse2/sse2
 # ---------------------
 
 debug
+imports/*
 examples/tools/plugandpaint/plugins
 include/*
 include/*/*
@@ -205,6 +193,8 @@ doc-build
 doc/html/*
 doc/qch
 doc-build
+doc/qtqml
+doc/qtquick
 .rcc
 .pch
 .metadata
@@ -261,3 +251,15 @@ src/xml/lib/
 *.dep
 *.map
 work
+
+#generated version headers
+src/qmltest/qtquicktestversion.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