diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 14:49:11 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 06:39:03 +0100 |
| commit | 507c01fe7ff6fdd51bc2bcf73ea87ce6b02ca321 (patch) | |
| tree | bbe5c398fbdf4c24fcdc7115778cf4031a689a15 /src/declarative/qml | |
| parent | 69835f7e506558d28006d4039ef47fc6069ddce5 (diff) | |
Fix breakage due to meta-type id reordering in qtbase
Cherry-pick of 40c8da550cac90460970f1dbdca1e6f02be99a8c in
qtdeclarative.
Change-Id: I85d0922dc1ddbdfc24c100d8bbf4d085513a5739
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 850928e3..64b6cf82 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -92,8 +92,14 @@ QDeclarativeValueTypeFactory::~QDeclarativeValueTypeFactory() bool QDeclarativeValueTypeFactory::isValueType(int idx) { - if ((uint)idx < QVariant::UserType) + if ((uint)idx < QVariant::UserType + && idx != QVariant::StringList + && idx != QMetaType::QObjectStar + && idx != QMetaType::QWidgetStar + && idx != QMetaType::VoidStar + && idx != QMetaType::QVariant) { return true; + } return false; } |