summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-12-09 06:24:35 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-12-09 06:24:35 (GMT)
commit32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba (patch)
tree6a33a5221b2f37dfa9782739b0b456cd7496a10b /doc/src/snippets/code
parent120a12f5dc13dea327cdbbbc94b58f29d1f3306b (diff)
parentf59908d4a6edcd333a156d4c94ddbd9b30f7e810 (diff)
downloadQt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.zip
Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.gz
Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 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]