diff options
| author | Giuseppe D'Angelo <dangelog@gmail.com> | 2012-03-11 00:26:17 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 10:53:24 +0100 |
| commit | 08790636f2b19a6bab97e3462211bec5b2d23c45 (patch) | |
| tree | 77e6dc5a9b79e4c0e3462c6bf345d0283cde144b /src/corelib/kernel/qmetatype.h | |
| parent | b8112c8526a6e261c6e00bdb4fe6ceef3876d01f (diff) | |
QRegularExpression: QMetaType and QVariant support
Removed the Q_DECLARE_METATYPE in favour of first-class support
inside QMetaType and QVariant.
Change-Id: I904236822bfab967dc0fbd4d4cc2bcb68c741adc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 4eadb34ea1..d913e37332 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -102,6 +102,7 @@ QT_BEGIN_NAMESPACE F(QUuid, 30, QUuid) \ F(QVariant, 41, QVariant) \ F(QModelIndex, 42, QModelIndex) \ + F(QRegularExpression, 44, QRegularExpression) #define QT_FOR_EACH_STATIC_CORE_POINTER(F)\ F(QObjectStar, 39, QObject*) \ @@ -194,7 +195,7 @@ public: QT_FOR_EACH_STATIC_TYPE(QT_DEFINE_METATYPE_ID) FirstCoreType = Bool, - LastCoreType = Void, + LastCoreType = QRegularExpression, FirstGuiType = QFont, LastGuiType = QPolygonF, FirstWidgetsType = QIcon, |