summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@trolltech.com>2006-04-10 10:51:56 +0000
committerThiago Macieira <thiago.macieira@trolltech.com>2006-04-10 10:51:56 +0000
commit58da365adf2773203a2d8fdcb65c8d89ff113dac (patch)
tree995021404462a7f0ef8891db3cdb285f752f1f51
parent68ed12603bb241f676f0d20b8f01c14d7a6a6a5a (diff)
* test/qt/tst_hal.cpp: Remove the waiting, since it's not
needed anymore. Requires Qt 4.1.3 to work properly. (r528148)
-rw-r--r--ChangeLog5
-rw-r--r--test/qt/tst_hal.cpp6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e57ae05..e39a985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com>
+ * test/qt/tst_hal.cpp: Remove the waiting, since it's not
+ needed anymore. Requires Qt 4.1.3 to work properly. (r528148)
+
+2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com>
+
Merge from Subversion:
* qt/qt-dbus.qdocconf: Update Trolltech's webpage link to
something that exists (r526315)
diff --git a/test/qt/tst_hal.cpp b/test/qt/tst_hal.cpp
index 57c9b46..f98eb98 100644
--- a/test/qt/tst_hal.cpp
+++ b/test/qt/tst_hal.cpp
@@ -51,7 +51,7 @@ void tst_Hal::getDevices()
QDBusMessage reply = con.sendWithReply(msg);
QVERIFY(!reply.isEmpty());
QVERIFY(reply.type() == QDBusMessage::ReplyMessage);
- qDebug() << reply;
+ //qDebug() << reply;
}
void tst_Hal::lock()
@@ -70,8 +70,8 @@ void tst_Hal::lock()
msg << "No reason...";
QDBusMessage reply = con.sendWithReply(msg);
- QTest::qWait(200);
- qDebug() << reply;
+ //QTest::qWait(200);
+ //qDebug() << reply;
QCOMPARE(spy.count, 3);
QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
}