From 92b4c1abcfc64855cd73733f136a86435e562beb Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 21 Nov 2011 16:03:53 +0100 Subject: Debugger: Make registration of services explicit Services now have to call registerService() themselves in the constructor. This fixes a race condition where the empty implementation of messageReceived() was called instead of the one in the subclass because the object wasn't fully constructed yet. Change-Id: I590ec8b76e906bdb6b5cdcb18680938edde283ee Reviewed-by: Aurindam Jana --- .../qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | 5 ++--- tests/auto/declarative/debugger/shared/debugutil.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 6063c1fdcb..21aeca9040 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -118,8 +118,7 @@ void tst_QDeclarativeDebugService::status() QTRY_COMPARE(service.status(), QDeclarativeDebugService::Unavailable); QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::status()\" "); - - QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::status()"); + QDeclarativeDebugTestService duplicate("tst_QDeclarativeDebugService::status()"); QCOMPARE(duplicate.status(), QDeclarativeDebugService::NotConnected); } @@ -138,7 +137,7 @@ void tst_QDeclarativeDebugService::sendMessage() QCOMPARE(resp, msg); QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::sendMessage()\" "); - QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::sendMessage()"); + QDeclarativeDebugTestService duplicate("tst_QDeclarativeDebugService::sendMessage()"); duplicate.sendMessage("msg"); } diff --git a/tests/auto/declarative/debugger/shared/debugutil.cpp b/tests/auto/declarative/debugger/shared/debugutil.cpp index 7af3d0f68f..b0ba5f27e6 100644 --- a/tests/auto/declarative/debugger/shared/debugutil.cpp +++ b/tests/auto/declarative/debugger/shared/debugutil.cpp @@ -62,6 +62,7 @@ bool QDeclarativeDebugTest::waitForSignal(QObject *receiver, const char *member, QDeclarativeDebugTestService::QDeclarativeDebugTestService(const QString &s, QObject *parent) : QDeclarativeDebugService(s, parent) { + registerService(); } void QDeclarativeDebugTestService::messageReceived(const QByteArray &ba) -- cgit v1.2.3