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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
  QVariant documentation:  there is no function QVariant::isEmpty()
  Added caching of vectorpaths to the GL paint engine.
  Extended tst_QListView::indexAt to test viewport bounds.
  Fix QFontCombobox autotest on X11
  In QListViews, items were being hovered even when mouse was on the scrollbars
  Fix crash in qt3support QPixmap constructor
  Fix tst_qsharedmemory on Unix
  Doc: Fixed up a known issue.
  Only call updateFont if the font have changed.
  Add some notes about known issues for win32-icc
  Fixed square root of negative number in drawTextItem().
  Fixed the GL2 engine stroker to handle Qt::SvgMiterJoin.
  Do not fill the disabled background of item.
  X11: Avoid loading all fonts in system for text with line breaks
  Do not recoginze templated types or pointers as flags.
  Compile webkit for win32-icc
  Fix tst_qspinbox compilation with winscw.
  compile fix for autotest
  compile fix for autotest
  state wasn't being correctly reloaded on mac with unified toolbar
  ...

3 files changed, 13 insertions, 2 deletions

diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index b8c2192..b26d68e 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -134,6 +134,18 @@
         currently calls winId() on widgets, which causes whole widget hierarchies
         to use native window handles. This slows down resizing.
 
+    \o  Compile errors with Intel C++ Compiler.\br
+        There seems to be a bug in the Intel compiler with respect to
+        over-agressive inlining of code.
+        The problem will manifest itself during the link phase of QtGui where
+        it fails with the error that it cannot find QObjectData::~QObjectData().
+        See \l{http://bugreports.qt.nokia.com/browse/QTBUG-5145} for updates on this
+        bug.
+        Also, due to some bugs in WebKit, the QtScript and QtWebKit modules
+        will not compile.
+        See \l{http://bugreports.qt.nokia.com/browse/QTBUG-6297} for a
+        workaround for QtScript.
+        
     \endlist
 
     \section2 Mac OS X
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index 0ae32c3..8f1202d 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -196,7 +196,7 @@
 
     \list
     \o Windows - Intel(R) C++ Compiler for 32-bit applications,
-       Version 8.1 Build 20050309Z Package ID: W_CC_PC_8.1.026
+       Version 9.1.040.
     \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based
        applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030
     \endlist
diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
index 6b9923c..41a9cb3 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
@@ -65,7 +65,6 @@ QVariant x, y(QString()), z(QString(""));
 x.convert(QVariant::Int);
 // x.isNull() == true
 // y.isNull() == true, z.isNull() == false
-// y.isEmpty() == true, z.isEmpty() == true
 //! [1]