diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /tests/auto/qml | |
parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'tests/auto/qml')
4 files changed, 17 insertions, 16 deletions
diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index 0069131bcf..7df753df03 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -111,7 +111,7 @@ QString QQmlDebugProcess::state() if (m_process.exitStatus() == QProcess::CrashExit) stateStr += " (crashed!)"; else - stateStr += ", return value" + m_process.exitCode(); + stateStr += ", return value " + QString::number(m_process.exitCode()); break; } case QProcess::Starting: stateStr = "starting"; break; diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp index d066c84efe..610d80d559 100644 --- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp +++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp @@ -91,7 +91,7 @@ QQmlEngineDebugClient::QQmlEngineDebugClient( quint32 QQmlEngineDebugClient::addWatch( const QmlDebugPropertyReference &property, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -117,7 +117,7 @@ quint32 QQmlEngineDebugClient::addWatch( const QmlDebugObjectReference &object, const QString &expr, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -133,7 +133,7 @@ quint32 QQmlEngineDebugClient::addWatch( quint32 QQmlEngineDebugClient::addWatch( const QmlDebugObjectReference &object, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -169,7 +169,7 @@ void QQmlEngineDebugClient::removeWatch(quint32 id, bool *success) quint32 QQmlEngineDebugClient::queryAvailableEngines(bool *success) { m_engines.clear(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -186,7 +186,7 @@ quint32 QQmlEngineDebugClient::queryRootContexts( const QmlDebugEngineReference &engine, bool *success) { m_rootContext = QmlDebugContextReference(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && engine.debugId != -1) { id = getId(); @@ -203,7 +203,7 @@ quint32 QQmlEngineDebugClient::queryObject( const QmlDebugObjectReference &object, bool *success) { m_object = QmlDebugObjectReference(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && object.debugId != -1) { id = getId(); @@ -221,7 +221,7 @@ quint32 QQmlEngineDebugClient::queryObjectsForLocation( const QString &file, int lineNumber, int columnNumber, bool *success) { m_objects.clear(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -239,7 +239,7 @@ quint32 QQmlEngineDebugClient::queryObjectRecursive( const QmlDebugObjectReference &object, bool *success) { m_object = QmlDebugObjectReference(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && object.debugId != -1) { id = getId(); @@ -257,7 +257,7 @@ quint32 QQmlEngineDebugClient::queryObjectsForLocationRecursive(const QString &f int lineNumber, int columnNumber, bool *success) { m_objects.clear(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -275,7 +275,7 @@ quint32 QQmlEngineDebugClient::queryExpressionResult( int objectDebugId, const QString &expr, bool *success) { m_exprResult = QVariant(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -293,7 +293,7 @@ quint32 QQmlEngineDebugClient::queryExpressionResultBC( int objectDebugId, const QString &expr, bool *success) { m_exprResult = QVariant(); - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled) { id = getId(); @@ -314,7 +314,7 @@ quint32 QQmlEngineDebugClient::setBindingForObject( QString source, int line, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) { id = getId(); @@ -333,7 +333,7 @@ quint32 QQmlEngineDebugClient::resetBindingForObject( const QString &propertyName, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) { id = getId(); @@ -350,7 +350,7 @@ quint32 QQmlEngineDebugClient::setMethodBody( int objectDebugId, const QString &methodName, const QString &methodBody, bool *success) { - quint32 id; + quint32 id = -1; *success = false; if (state() == QQmlDebugClient::Enabled && objectDebugId != -1) { id = getId(); diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 93f3b66504..d022e9dedc 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -1496,7 +1496,7 @@ void tst_qqmlecmascript::componentCreation() if (creationError.isEmpty()) { QVERIFY(created); - QObject *expectedParent; + QObject *expectedParent = reinterpret_cast<QObject *>(quintptr(-1)); if (createdParent == QLatin1String("obj")) { expectedParent = object; } else if ((createdParent == QLatin1String("null")) || createdParent.isEmpty()) { diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp index 29c7909267..3ae27fe9c3 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp +++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp @@ -1173,6 +1173,7 @@ void tst_qqmlxmlhttprequest::stateChangeCallingContext() QQmlComponent component(&engine, testFileUrl("stateChangeCallingContext.qml")); QObject *object = component.create(); QVERIFY(object != 0); + server.sendDelayedItem(); QTRY_VERIFY(object->property("success").toBool() == true); delete object; } |