summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-31 12:14:35 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-31 12:14:35 (GMT)
commit67f50468b296264318526ee4fec9f4fc8f2ad506 (patch)
treeaece97aada2029370ad19f9623437154300e9f86 /src
parentb5c211d7dae37bda142769d6c8a7b9181b900324 (diff)
parentab2faea59aef652606fdf34ccc8af83f1b6d557a (diff)
downloadQt-67f50468b296264318526ee4fec9f4fc8f2ad506.zip
Qt-67f50468b296264318526ee4fec9f4fc8f2ad506.tar.gz
Qt-67f50468b296264318526ee4fec9f4fc8f2ad506.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qvariant.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 099fdf4..58f6537 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1589,6 +1589,7 @@ QVariant::QVariant(const char *val)
\fn QVariant::QVariant(float val)
Constructs a new variant with a floating point value, \a val.
+ \since 4.6
*/
/*!