diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-21 17:48:50 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-01 10:59:41 (GMT) |
| commit | 7101a3fafb40cacb855ee07036ce4baacc5d202b (patch) | |
| tree | 619cb68cf1dd716a3ee527e103bb4901853e409e /src/declarative | |
| parent | 2365b2dfd57770875b6eefb165ec27f3bf65dd0c (diff) | |
| download | Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.zip Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.tar.gz Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.tar.bz2 | |
Compile with QStringBuilder and QByteArray
Reviewed-by: Denis
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index 0dd0edb..7f74da4 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -1029,7 +1029,7 @@ bool QDeclarativePropertyPrivate::writeEnumProperty(const QMetaProperty &prop, i else v = QVariant(menum.keyToValue(value.toByteArray())); } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) { - int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope()) + "::" + menum.name()); + int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope() + QByteArray("::") + menum.name())); if ((enumMetaTypeId == 0) || (v.userType() != enumMetaTypeId) || !v.constData()) return false; v = QVariant(*reinterpret_cast<const int *>(v.constData())); |