Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (245 commits)
  Removed obsolete documentation from QPixmap.
  Fixed auto-test failures caused by a3a79fefe65ec12.
  Improved error msg
  Place cursor at the end of the selected range
  Fail in a nicer way when QPixmap is used in a non-GUI application.
  Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
  Position the TextInput cursor correctly after IM text is commited.
  Add qscriptobject and context2d to "trusted" benchmarks
  qdoc3: Fix compilation with -no-stl
  fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is used
  Don't allow non-Object values to be set as prototype
  Make the TextInput cursorRectangle relative to the item.
  Don't assert if font engine creates new glyphs
  Doc: remove experimental GestureArea from contents and add PinchArea
  Add QML file for TextEdit positionAt test.
  un-document semicolon-splitting of INCLUDEPATH
  don't add extraneous empty command lines
  make the $$quote() function less prominent
  minor cleanup of the QMAKE_POST_LINK command line construction
  silence qmake warning about unbalanced parentheses
  ...

1 files changed, 10 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index d446680..462f8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,3 +249,13 @@ src/network/lib
 src/xml/lib/
 
 .pc/
+
+# INTEGRITY generated files
+*.gpj
+*.int
+*.ael
+*.dla
+*.dnm
+*.dep
+*.map
+work