diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-20 03:38:35 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-20 04:27:26 (GMT) |
| commit | 695461282f1e225608800f87cf1259176067e55d (patch) | |
| tree | 8d4d341c2c1f0bd9c280d62cbc011888aab87a02 | |
| parent | e792c38a265ecf21b508e98c9c81e3da8576d709 (diff) | |
| download | Qt-695461282f1e225608800f87cf1259176067e55d.zip Qt-695461282f1e225608800f87cf1259176067e55d.tar.gz Qt-695461282f1e225608800f87cf1259176067e55d.tar.bz2 | |
Stop warnings.
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index 291378f..c6ee46f 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -1224,7 +1224,7 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count, if (d->m_listModelInterface) roleName = d->m_listModelInterface->toString(role); else if (d->m_abstractItemModel) - roleName = d->m_abstractItemModel->roleNames().value(role); + roleName = QString::fromUtf8(d->m_abstractItemModel->roleNames().value(role)); qmlInfo(this) << "Changing role not present in item: " << roleName; } } diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 3ab94d3..0a75532 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1024,14 +1024,14 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS foreach (const QDeclarativeError &error, errors){ errstr += QLatin1String(" ") + error.toString() + QLatin1String("\n"); QScriptValue qmlErrObject = ctxt->engine()->newObject(); - qmlErrObject.setProperty("lineNumber", QScriptValue(error.line())); - qmlErrObject.setProperty("columnNumber", QScriptValue(error.column())); - qmlErrObject.setProperty("fileName", QScriptValue(error.url().toString())); - qmlErrObject.setProperty("message", QScriptValue(error.description())); + qmlErrObject.setProperty(QLatin1String("lineNumber"), QScriptValue(error.line())); + qmlErrObject.setProperty(QLatin1String("columnNumber"), QScriptValue(error.column())); + qmlErrObject.setProperty(QLatin1String("fileName"), QScriptValue(error.url().toString())); + qmlErrObject.setProperty(QLatin1String("message"), QScriptValue(error.description())); arr.setProperty(i++, qmlErrObject); } QScriptValue err = ctxt->throwError(errstr); - err.setProperty("qmlErrors",arr); + err.setProperty(QLatin1String("qmlErrors"),arr); return err; } @@ -1051,14 +1051,14 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS foreach (const QDeclarativeError &error, errors){ errstr += QLatin1String(" ") + error.toString() + QLatin1String("\n"); QScriptValue qmlErrObject = ctxt->engine()->newObject(); - qmlErrObject.setProperty("lineNumber", QScriptValue(error.line())); - qmlErrObject.setProperty("columnNumber", QScriptValue(error.column())); - qmlErrObject.setProperty("fileName", QScriptValue(error.url().toString())); - qmlErrObject.setProperty("message", QScriptValue(error.description())); + qmlErrObject.setProperty(QLatin1String("lineNumber"), QScriptValue(error.line())); + qmlErrObject.setProperty(QLatin1String("columnNumber"), QScriptValue(error.column())); + qmlErrObject.setProperty(QLatin1String("fileName"), QScriptValue(error.url().toString())); + qmlErrObject.setProperty(QLatin1String("message"), QScriptValue(error.description())); arr.setProperty(i++, qmlErrObject); } QScriptValue err = ctxt->throwError(errstr); - err.setProperty("qmlErrors",arr); + err.setProperty(QLatin1String("qmlErrors"),arr); return err; } |