diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-14 08:55:20 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-14 08:55:20 (GMT) |
| commit | 57295fb967cd7d50a1e4113edf995b9592d1576f (patch) | |
| tree | 4805c52028407a0376738070749c182e11547591 /src/declarative/qml | |
| parent | 740e1f88da76b9d52bc0b5600b808e91cec97f73 (diff) | |
| download | Qt-57295fb967cd7d50a1e4113edf995b9592d1576f.zip Qt-57295fb967cd7d50a1e4113edf995b9592d1576f.tar.gz Qt-57295fb967cd7d50a1e4113edf995b9592d1576f.tar.bz2 | |
Fix compile warnings.
Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativescriptparser.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativexmlhttprequest.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp index 9d74238..ab6ff74 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp @@ -843,7 +843,7 @@ QDeclarativeObjectMethodScriptClass::Value QDeclarativeObjectMethodScriptClass:: for (int ii = 0; ii < argTypeNames.count(); ++ii) { argTypes[ii] = QMetaType::type(argTypeNames.at(ii)); if (argTypes[ii] == QVariant::Invalid) - argTypes[ii] = enumType(method->object->metaObject(), argTypeNames.at(ii)); + argTypes[ii] = enumType(method->object->metaObject(), QString::fromLatin1(argTypeNames.at(ii))); if (argTypes[ii] == QVariant::Invalid) return Value(ctxt, ctxt->throwError(QString::fromLatin1("Unknown method parameter type: %1").arg(QLatin1String(argTypeNames.at(ii))))); } diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index c956051..57cc9ab 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -895,7 +895,7 @@ QList<QDeclarativeError> QDeclarativeScriptParser::errors() const static void replaceWithSpace(QString &str, int idx, int n) { QChar *data = str.data() + idx; - QChar space(' '); + const QChar space(QLatin1Char(' ')); for (int ii = 0; ii < n; ++ii) *data++ = space; } diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index d832638..332acc4 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -1640,8 +1640,8 @@ static QScriptValue qmlxmlhttprequest_responseXML(QScriptContext *context, QScri THROW_REFERENCE("Not an XMLHttpRequest object"); if (!request->receivedXml() || - request->readyState() != QDeclarativeXMLHttpRequest::Loading && - request->readyState() != QDeclarativeXMLHttpRequest::Done) + (request->readyState() != QDeclarativeXMLHttpRequest::Loading && + request->readyState() != QDeclarativeXMLHttpRequest::Done)) return engine->nullValue(); else return Document::load(engine, request->rawResponseBody()); |