diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-06-22 09:23:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 06:54:59 +0200 |
| commit | 55faad4873a9409bb1b33a10da7329d13a95aff9 (patch) | |
| tree | b08f5b801079e49ddc9d6a5839eeb14a1e238a0f /src/qml/qml/qqmlcustomparser_p.h | |
| parent | 033bf75d99c281d4a133fada297b7b141a0af555 (diff) | |
Handle enum values of -1 correctly.
This was already handled correctly most places; now the
remaining cases (using an enum in ListModel, and assigning
an enum to an integer property) should also work correctly.
Task-number: QTBUG-21679
Change-Id: Ibff13f0b94da94b18e2e3bae4aa6ba44e0fa944b
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcustomparser_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcustomparser_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h index 0207797ce9..b8cc9f7644 100644 --- a/src/qml/qml/qqmlcustomparser_p.h +++ b/src/qml/qml/qqmlcustomparser_p.h @@ -137,7 +137,7 @@ protected: void error(const QQmlCustomParserProperty&, const QString& description); void error(const QQmlCustomParserNode&, const QString& description); - int evaluateEnum(const QByteArray&) const; + int evaluateEnum(const QByteArray&, bool *ok) const; const QMetaObject *resolveType(const QString&) const; |