summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-17 18:16:13 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-17 18:16:13 (GMT)
commit42e342d1b3924206c7fa4175cb064dc2bbe0f00c (patch)
tree12f01bb114f956dd257507f0106c39d5a5247a12 /src/corelib/kernel/qvariant.cpp
parent7332e42363eb93f1de032319439a7250e16b3b12 (diff)
parentf37c1ea90b4265f1e2b2e7de9bbb0a021ca230d6 (diff)
downloadQt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.zip
Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.gz
Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
-rw-r--r--src/corelib/kernel/qvariant.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 66c4176..54d6073 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1164,9 +1164,8 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler;
\brief The QVariant class acts like a union for the most common Qt data types.
\ingroup objectmodel
- \ingroup misc
\ingroup shared
- \mainclass
+
Because C++ forbids unions from including types that have
non-default constructors or destructors, most interesting Qt