Add QAbstractDeclarativeData::isSignalConnected hook

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

diff --git a/.gitignore b/.gitignore
index 90010e3..4906f24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,7 @@ bin/moc*
 bin/makeqpf*
 bin/pixeltool*
 bin/qmake*
-bin/qdoc3*
+bin/qdoc*
 bin/qt3to4*
 bin/qtdemo*
 bin/qttracereplay*
@@ -97,9 +97,11 @@ configure.cache
 config.status
 mkspecs/default
 mkspecs/qconfig.pri
+mkspecs/qdevice.pri
 moc_*.cpp
 qmake/qmake.exe
 qmake/Makefile.bak
+qmake/qmake_pch.pch
 src/corelib/global/qconfig.cpp
 src/corelib/global/qconfig.h
 src/corelib/global/qconfig.h.qmake
@@ -111,6 +113,8 @@ tests/auto/qmake/testdata/quotedfilenames/*.exe
 tests/auto/compilerwarnings/*.exe
 tests/auto/qmake/testdata/quotedfilenames/test.cpp
 tests/auto/qprocess/fileWriterProcess.txt
+tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/mime/
+tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/mime/
 .com.apple.timemachine.supported
 tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
@@ -119,6 +123,7 @@ translations/*.qm
 translations/*_untranslated.ts
 qrc_*.cpp
 
+src/concurrent/qtconcurrentversion.h
 src/corelib/qtcoreversion.h
 src/dbus/qtdbusversion.h
 src/gui/qtguiversion.h
@@ -168,6 +173,10 @@ src/3rdparty/webkit/WebCore/mocinclude.tmp
 src/3rdparty/webkit/includes.txt
 src/3rdparty/webkit/includes2.txt
 
+# generated files in configure.exe bootstrapping
+tools/configure/configure.intermediate.manifest
+tools/configure/configure_pch.pch
+
 # Symlinks generated by configure
 tools/qvfb/qvfbhdr.h
 tools/qvfb/qlock_p.h
@@ -206,6 +215,7 @@ examples/tools/plugandpaint/plugins
 include/*
 include/*/*
 lib/*
+imports/*
 !lib/fonts
 !lib/README
 plugins/*/*
@@ -278,6 +288,7 @@ work
 
 #generated module def and version header files
 mkspecs/modules/qt_*.pri
+mkspecs/modules-inst/
 mkspecs/qmodule.pri
 
 #unit tests libs/plugins