summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-12-04 14:02:35 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-12-04 14:02:35 (GMT)
commit33441e2a611f07207b0b942368aab9010cdf8ab1 (patch)
tree77a223255bab621549f340c86fe19005f1ebbc62 /doc/src/snippets/code
parent77f274672480e5980d9f42e4fd94c9770279543b (diff)
parentb6cf9e28c2fef9112789e98ac9d1eda45a407889 (diff)
downloadQt-33441e2a611f07207b0b942368aab9010cdf8ab1.zip
Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.gz
Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets/code')
-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]