diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-12-03 10:23:41 (GMT) |
| commit | f57eaeb3c46a375113e5d5ebaf0c2cb289795606 (patch) | |
| tree | 70dc33f63d7b1ea3adb9eeecf67b8d05fdd66270 /doc/src/snippets/code | |
| parent | 4a58e7f64e5922e7815a98244c4b8dda1689ff26 (diff) | |
| parent | 831e286f811c0e0238f3dd061ae41782f8637a16 (diff) | |
| download | Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.zip Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.gz Qt-f57eaeb3c46a375113e5d5ebaf0c2cb289795606.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoawindow_mac.mm
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qvariant.cpp | 1 |
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] |