summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 04:47:53 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 04:48:58 (GMT)
commitd6817c59b664b1ce08e45bed902f17b58160a30f (patch)
tree8a0c8736a0c26446756976f8dfd1212345ab847e /src/declarative/qml/qdeclarativeengine.cpp
parente3ec89ed31439a83c10a2fc2d770283f4f10f31a (diff)
downloadQt-d6817c59b664b1ce08e45bed902f17b58160a30f.zip
Qt-d6817c59b664b1ce08e45bed902f17b58160a30f.tar.gz
Qt-d6817c59b664b1ce08e45bed902f17b58160a30f.tar.bz2
Use QDateTime when specifying a "date" property in QML
QT-718
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index a153f8f..5335b8c 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1306,13 +1306,14 @@ QScriptValue QDeclarativeEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine
QScriptValue QDeclarativeEnginePrivate::scriptValueFromVariant(const QVariant &val)
{
if (val.userType() == qMetaTypeId<QDeclarativeListReference>()) {
- QDeclarativeListReferencePrivate *p = QDeclarativeListReferencePrivate::get((QDeclarativeListReference*)val.constData());
+ QDeclarativeListReferencePrivate *p =
+ QDeclarativeListReferencePrivate::get((QDeclarativeListReference*)val.constData());
if (p->object) {
return listClass->newList(p->property, p->propertyType);
} else {
return scriptEngine.nullValue();
}
- }
+ }
bool objOk;
QObject *obj = QDeclarativeMetaType::toQObject(val, &objOk);