diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-17 15:06:10 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-17 15:06:10 (GMT) |
| commit | 97668bd920685d25faf82bfde2027305e67b202e (patch) | |
| tree | 9e2f1efc273ffde3c80df5ddedd19d3b448208b9 /.gitignore | |
| parent | 72aa2eb43b0cf5a6eef940da05ac58f605794ffb (diff) | |
| parent | 77c4df1325c4bae10c99978a325febada9fd82d0 (diff) | |
| download | Qt-97668bd920685d25faf82bfde2027305e67b202e.zip Qt-97668bd920685d25faf82bfde2027305e67b202e.tar.gz Qt-97668bd920685d25faf82bfde2027305e67b202e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alien-squached
Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qwidget_mac.mm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -119,6 +119,14 @@ translations/*.qm translations/*_untranslated.ts qrc_*.cpp +# Test generated files +QObject.log +tst_* +!tst_*.* +tst_*.log +tst_*.debug +tst_*~ + # xemacs temporary files *.flc @@ -203,7 +211,7 @@ doc-build # --------------------- ABLD.BAT -bld.inf +bld.inf* *.mmp *.mk *.rss @@ -221,6 +229,10 @@ plugin_commonu.def *.sym *.lib +# runonphone crash dumps +d_exc_*.txt +d_exc_*.stk + # Generated by abldfast.bat from devtools. .abldsteps.* @@ -235,3 +247,5 @@ qtc-debugging-helper src/corelib/lib src/network/lib src/xml/lib/ + +.pc/ |