summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-20 23:30:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-20 23:30:31 +0100
commite5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch)
tree8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/auto/network/socket/qudpsocket/clientserver/main.cpp
parent0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff)
parent76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff)
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/network/socket/qudpsocket/clientserver/main.cpp')
-rw-r--r--tests/auto/network/socket/qudpsocket/clientserver/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/main.cpp b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
index 233d9d1a1c..645aacf22e 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
@@ -79,7 +79,7 @@ public:
}
fflush(stdout);
- connect(this, SIGNAL(readyRead()), this, SLOT(readData()));
+ connect(this, SIGNAL(readyRead()), this, SLOT(readTestData()));
}
protected:
@@ -101,7 +101,7 @@ protected:
}
private slots:
- void readData()
+ void readTestData()
{
printf("readData()\n");
switch (type) {