summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2009-12-08 09:10:52 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2009-12-08 09:10:52 (GMT)
commit3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54 (patch)
treebdd95d791244c6cc72a19a48118ab72ff5edcfb2 /doc/src/snippets
parent55be2d1d684d4505db3bbf76da0cf8326cee9468 (diff)
parentdfbdb86fd4614be9be17cbfb602ed5a3b5a38671 (diff)
downloadQt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.zip
Qt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.tar.gz
Qt-3f5e4ed4d2b110f4c6e952b74c9f852a2dc14a54.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/src_corelib_kernel_qvariant.cpp1
1 files changed, 0 insertions, 1 deletions
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]