diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-05-19 18:02:21 +1000 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2011-05-19 18:02:21 +1000 |
| commit | fcdd4d4dd565c4ec8b22d9ee5aa0ad2428a4336b (patch) | |
| tree | f39b7b1752a2abd1995b0d6c4809318634124698 | |
| parent | 6dcf67306215a9475c9ca83ddf951de15f2dfe8b (diff) | |
Normalize createQmlObject error message
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 001884161b..86b7e9412f 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1398,7 +1398,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS QScriptValue arr = ctxt->engine()->newArray(errors.length()); int i = 0; foreach (const QDeclarativeError &error, errors){ - errstr += QLatin1String(" ") + error.toString() + QLatin1String("\n"); + errstr += QLatin1String("\n ") + error.toString(); QScriptValue qmlErrObject = ctxt->engine()->newObject(); qmlErrObject.setProperty(QLatin1String("lineNumber"), QScriptValue(error.line())); qmlErrObject.setProperty(QLatin1String("columnNumber"), QScriptValue(error.column())); @@ -1425,7 +1425,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS QScriptValue arr = ctxt->engine()->newArray(errors.length()); int i = 0; foreach (const QDeclarativeError &error, errors){ - errstr += QLatin1String(" ") + error.toString() + QLatin1String("\n"); + errstr += QLatin1String("\n ") + error.toString(); QScriptValue qmlErrObject = ctxt->engine()->newObject(); qmlErrObject.setProperty(QLatin1String("lineNumber"), QScriptValue(error.line())); qmlErrObject.setProperty(QLatin1String("columnNumber"), QScriptValue(error.column())); diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 80d9d9361c..e6024ea8f9 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -412,11 +412,11 @@ void tst_qdeclarativeqt::createQmlObject() QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml")); QString warning1 = component.url().toString() + ":7: Error: Qt.createQmlObject(): Invalid arguments"; - QString warning2 = component.url().toString()+ ":10: Error: Qt.createQmlObject() failed to create object: " + TEST_FILE("inline").toString() + ":2:10: Blah is not a type\n"; - QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject() failed to create object: " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name\n"; + QString warning2 = component.url().toString()+ ":10: Error: Qt.createQmlObject() failed to create object: \n " + TEST_FILE("inline").toString() + ":2:10: Blah is not a type"; + QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject() failed to create object: \n " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name"; QString warning4 = component.url().toString()+ ":9: Error: Qt.createQmlObject(): Missing parent object"; QString warning5 = component.url().toString()+ ":8: Error: Qt.createQmlObject(): Invalid arguments"; - QString warning6 = "RunTimeError: Qt.createQmlObject() failed to create object: " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method\n"; + QString warning6 = "RunTimeError: Qt.createQmlObject() failed to create object: \n " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); |