summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-12-02 13:22:14 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-12-02 13:22:29 (GMT)
commit25023911295c201758faaa2c800b2388ddf1e0b0 (patch)
tree74cbd3766b1207a00d1bd48dd3a5798307a540c9 /doc/src/snippets/code
parentd16ba0a93d611689bce9a2732a1cc8c9a317f5bf (diff)
parentfb01592ef98dbaa4d0591df77cffaaf0ea0e117a (diff)
downloadQt-25023911295c201758faaa2c800b2388ddf1e0b0.zip
Qt-25023911295c201758faaa2c800b2388ddf1e0b0.tar.gz
Qt-25023911295c201758faaa2c800b2388ddf1e0b0.tar.bz2
Merge commit 'oslo-staging-2/4.6' into upstream/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]