diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-25 17:17:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-28 04:30:19 +0200 |
| commit | 339dc331fddb0c1ff0b23c33e644aa05c92f31cc (patch) | |
| tree | 7ae0249e8ff88db818def4ad7985291f90cb9a3a /src/corelib/io/qurl.h | |
| parent | bb0ef1cc5b2d3873afc87cd1b0e7b11a80adafe0 (diff) | |
Specialize QTypeInfo for QUrlTwoFlags to mark it PRIMITIVE.
QTypeInfoMerger combines the typeinfos for the (PRIMITIVE) flag arguments.
Change-Id: I5abf00489491d099f2bf7ba25c191a771a383d78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 7e694799cc..475806e7e4 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -113,6 +113,9 @@ public: inline bool testFlag(E2 f) const { return (i & f) == f && (f != 0 || i == int(f)); } }; +template<typename E1, typename E2> +class QTypeInfo<QUrlTwoFlags<E1, E2> > : public QTypeInfoMerger<QUrlTwoFlags<E1, E2>, E1, E2> {}; + class Q_CORE_EXPORT QUrl { public: |