summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qmetatype.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-07 15:18:16 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-07 15:18:16 +0100
commitcdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch)
tree10733cb3fb35647b19cfd15ab158f56b1cb550e1 /src/corelib/kernel/qmetatype.cpp
parent21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff)
parenta8321f21fb82714771b4717c99dd475f2c74649e (diff)
Merge branch 'stable' into dev
Conflicts: tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r--src/corelib/kernel/qmetatype.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 6194f20912..0d737ac1a3 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -240,6 +240,7 @@ struct DefinedTypesFilter {
\omitvalue PointerToQObject
\omitvalue WeakPointerToQObject
\omitvalue TrackingPointerToQObject
+ \omitvalue WasDeclaredAsMetaType
*/
/*!