Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
  Mac: Select Carbon when using the 10.4u SDK.
  fix connecting to an ID.
  make the value of QMAKE_QMAKE somewhat less magic
  Assistant: Don't warn for non-existing English to English translations.
  Assistant: Un-watch files at shutdown.
  Help system: Build search index with low priority.
  Fixed a regression in the syntax highlighter
  Add a template specialisation for QArgument when T is a reference.
  Always run syncqt if using a Git checkout.
  Added comment about usage of strncpy_s function in VC++ > 14.00
  Compile.
  OS X 10.4 compile error; required casting int to GLint.
  QtDeclarative: Fix compiler warnings
  Implement alien widgets on Mac/Cocoa.
  QDeclarativeView: Add a Designer plugin.
  QDeclarativeView: Make usable in Designer
  minor optimization: don't mark contents as dirty if nothing was changed
  minor optimization: ignore invalid preeditAreaPosition/preeditAreaText
  remove unused code
  minor clean-ups and styling fixes
  ...

1 files changed, 0 insertions, 2 deletions

diff --git a/tools/qdoc3/jambiapiparser.cpp b/tools/qdoc3/jambiapiparser.cpp
index 3aba1b0..23f2716 100644
--- a/tools/qdoc3/jambiapiparser.cpp
+++ b/tools/qdoc3/jambiapiparser.cpp
@@ -43,8 +43,6 @@
     jambiapiparser.cpp
 */
 
-#include <QtXml>
-
 #include "cppcodeparser.h"
 #include "jambiapiparser.h"
 #include "node.h"