diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-01-07 16:57:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-07 18:07:29 +0100 |
| commit | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (patch) | |
| tree | fbf5ef281002a47659d80405ae38f48b57e19c22 /src/corelib/kernel/qmetatype.cpp | |
| parent | 998899cf3a2501d3bf30ad06ce47a2cf81e1d60b (diff) | |
| parent | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 8a04b06c42..82b6ed54d1 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 */ /*! |