diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 09:09:12 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 09:10:18 +1000 |
| commit | bcec005dd1cb6eea2c2a43b681be9b56eb06fba7 (patch) | |
| tree | b426c3a515b2388c39059aa2cdc8fd409661787c /.gitignore | |
| parent | 08a5b8d504e86a80488a2a13525e700b6f8b3311 (diff) | |
| parent | 5e38a334b1ef46a932c8aff65a7d448b5c7df853 (diff) | |
| download | qt4-tools-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.tar.gz | |
Merge remote branch 'origin/4.7' into 4.8-from-4.7
Conflicts:
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.ui
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 11bc5b4ab0..7a872c1295 100644 --- a/.gitignore +++ b/.gitignore @@ -51,8 +51,8 @@ Makefile* !qmake/Makefile.unix *.prl *.app -*.pro.user -*.qmlproject.user +*.pro.user* +*.qmlproject.user* *.gcov bin/Qt*.dll bin/assistant* @@ -202,6 +202,7 @@ release tmp doc-build doc/html/* +tools/qdoc3/doc/html/* doc/qch doc-build .rcc @@ -245,6 +246,8 @@ d_exc_*.stk *.d qtc-debugging-helper +qtc-qmldump +qtc-qmldbg src/corelib/lib src/network/lib src/xml/lib/ |