Merge remote-tracking branch 'origin/5.3' into 5.4

[contrib/qtwebsockets.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4620203..218d86e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,59 @@
-examples/websocketserver/moc_dataprocessor.cpp
-examples/websocketserver/moc_handshakeresponse.cpp
-examples/websocketserver/moc_helloworldserver.cpp
-examples/websocketserver/moc_websocket.cpp
-examples/websocketserver/moc_websocketserver.cpp
+# C++ objects and libs
+
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.so.*
+*.dll
+*.dylib
+*.obj
+Makefile*
+
+# Directories to ignore
+# ---------------------
+
+include/*
+include/*/*
+lib/*
+
+# generated module def and version header files
+mkspecs/modules/qt_*.pri
+mkspecs/modules-inst/
+
 examples/websocketserver/websocketserver
-build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/moc_dataprocessor.cpp
-build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/moc_handshakeresponse.cpp
-build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/moc_helloworldserver.cpp
-build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/moc_websocket.cpp
-build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/moc_websocketserver.cpp
 build-examples-Qt_5_1_0_clang_64_temporary-Debug/websocketserver/websocketserver
 examples/examples.pro.user.2.7pre1
-build-unittests-Qt_5_1_0_clang_64-Debug/moc_dataprocessor.cpp
-build-unittests-Qt_5_1_0_clang_64-Debug/moc_handshakeresponse.cpp
-build-unittests-Qt_5_1_0_clang_64-Debug/moc_websocket.cpp
-build-unittests-Qt_5_1_0_clang_64-Debug/moc_websocketserver.cpp
-build-unittests-Qt_5_1_0_clang_64-Debug/tst_compliance.moc
-build-unittests-Qt_5_1_0_clang_64-Debug/tst_websockets.moc
 build-unittests-Qt_5_1_0_clang_64-Debug/unittest_result.xml
 build-unittests-Qt_5_1_0_clang_64-Debug/unittests
-build-unittests-Qt_5_1_0_clang_64-Release/moc_dataprocessor.cpp
-build-unittests-Qt_5_1_0_clang_64-Release/moc_handshakeresponse.cpp
-build-unittests-Qt_5_1_0_clang_64-Release/moc_websocket.cpp
-build-unittests-Qt_5_1_0_clang_64-Release/moc_websocketserver.cpp
-build-unittests-Qt_5_1_0_clang_64-Release/tst_compliance.moc
-build-unittests-Qt_5_1_0_clang_64-Release/tst_websockets.moc
 build-unittests-Qt_5_1_0_clang_64-Release/unittests
 examples/.coverity-submit
 
+# Qt specific
+.qmake.cache
+*.pro.user
+*.pro.shared
+moc_*.cpp
+*.moc
+*_resource.rc
+ui_*.h
+qrc_*.cpp
+
+*~
+*.pdb
+*.exe
+*.lib
+*.res
+*.exp
+*.manifest
+config.log
+tmp
+imports/*
+include
+tests/auto/cmake/build
+lib/
+mkspecs/
+qml/