summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
commitf29f1bb287c6b39bd1270802d1579f1c1d53f905 (patch)
treef903e18b163591c3590473e4a117a3c8958d8847 /doc
parent271936b063fb261293e3f77f7a2273e3a4dbb5d6 (diff)
parent25023911295c201758faaa2c800b2388ddf1e0b0 (diff)
downloadQt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.zip
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.gz
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.bz2
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'doc')
-rw-r--r--doc/src/getting-started/known-issues.qdoc14
-rw-r--r--doc/src/platforms/compiler-notes.qdoc2
-rw-r--r--doc/src/snippets/code/src_corelib_kernel_qvariant.cpp1
3 files changed, 14 insertions, 3 deletions
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index b8c2192..a8de0a1 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -54,7 +54,7 @@
on the Qt website.
An overview of known issues may also be found at:
- \l{http://qt.gitorious.org/qt/pages/Qt460BetaKnownIssues}
+ \l{http://qt.gitorious.org/qt/pages/Qt460KnownIssues}
{Known Issues Wiki}.
\section1 Installation Issues
@@ -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]