Allow Loader to load non-Item types.

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

diff --git a/.gitignore b/.gitignore
index 5b4d2f2..a6b0a7f 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,6 +100,7 @@ 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
@@ -138,6 +125,8 @@ tst_*~
 *.idb
 *.ilk
 *.pdb
+*.dll
+*.exp
 *.sln
 *.suo
 *.vcproj
@@ -259,3 +248,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