diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/qml/qqmldirparser.cpp | 12 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8contextwrapper.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp index df5f7f8ee9..82289311c9 100644 --- a/src/qml/qml/qqmldirparser.cpp +++ b/src/qml/qml/qqmldirparser.cpp @@ -297,16 +297,16 @@ QList<QQmlDirParser::TypeInfo> QQmlDirParser::typeInfos() const QDebug &operator<< (QDebug &debug, const QQmlDirParser::Component &component) { - return debug << qPrintable(QString("{%1 %2.%3}").arg(component.typeName) - .arg(component.majorVersion) - .arg(component.minorVersion)); + const QString output = QString::fromLatin1("{%1 %2.%3}"). + arg(component.typeName).arg(component.majorVersion).arg(component.minorVersion); + return debug << qPrintable(output); } QDebug &operator<< (QDebug &debug, const QQmlDirParser::Script &script) { - return debug << qPrintable(QString("{%1 %2.%3}").arg(script.nameSpace) - .arg(script.majorVersion) - .arg(script.minorVersion)); + const QString output = QString::fromLatin1("{%1 %2.%3}"). + arg(script.nameSpace).arg(script.majorVersion).arg(script.minorVersion); + return debug << qPrintable(output); } QT_END_NAMESPACE diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp index 39392b8984..8a98727205 100644 --- a/src/qml/qml/v8/qv8contextwrapper.cpp +++ b/src/qml/qml/v8/qv8contextwrapper.cpp @@ -327,7 +327,7 @@ v8::Handle<v8::Value> QV8ContextWrapper::Getter(v8::Local<v8::String> property, const QVariant &value = cp->propertyValues.at(propertyIdx); if (value.userType() == qMetaTypeId<QList<QObject*> >()) { - QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*)propertyIdx, + QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*) qintptr(propertyIdx), 0, QQmlContextPrivate::context_count, QQmlContextPrivate::context_at); |