summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-12 11:02:01 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-12 12:48:12 +0200
commit6697f2a899fac47a65122a85691b2cfe63c6152c (patch)
tree6ae8ad93c7455f9571d1b1b868ae077af89d96df /.gitignore
parente577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff)
parent1f806aa1b40db276dad359863d018171080d93f9 (diff)
Merge remote branch 'origin/master' into refactor
Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5b4d2f2440..0db34fab52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,16 @@ translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+src/corelib/qtcoreversion.h
+src/dbus/qtdbusversion.h
+src/gui/qtguiversion.h
+src/network/qtnetworkversion.h
+src/opengl/qtopenglversion.h
+src/openvg/qtopenvgversion.h
+src/sql/qtsqlversion.h
+src/testlib/qttestversion.h
+src/xml/qtxmlversion.h
+
# Test generated files
QObject.log
tst_*