[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 14:19:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e725ea3f9a904984499e313fb9ec2e3969470b14
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 19:16:02 2010 +0000
2010-10-06 Andras Becsi <abecsi at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Correct CamelCase of socketSentdata() in SocketStreamHandlePrivate
to fix "QMetaObject::invokeMethod: No such method" warnings in layout tests.
https://bugs.webkit.org/show_bug.cgi?id=47284
No new tests needed.
* platform/network/qt/SocketStreamHandlePrivate.h:
* platform/network/qt/SocketStreamHandleQt.cpp:
(WebCore::SocketStreamHandlePrivate::socketSentData):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69221 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5115ed2..a7050c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-06 Andras Becsi <abecsi at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Correct CamelCase of socketSentdata() in SocketStreamHandlePrivate
+ to fix "QMetaObject::invokeMethod: No such method" warnings in layout tests.
+ https://bugs.webkit.org/show_bug.cgi?id=47284
+
+ No new tests needed.
+
+ * platform/network/qt/SocketStreamHandlePrivate.h:
+ * platform/network/qt/SocketStreamHandleQt.cpp:
+ (WebCore::SocketStreamHandlePrivate::socketSentData):
+
2010-10-06 David Hyatt <hyatt at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
index 235f1b1..d074f42 100644
--- a/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
+++ b/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
@@ -54,7 +54,7 @@ public slots:
void socketReadyRead();
int send(const char* data, int len);
void close();
- void socketSentdata();
+ void socketSentData();
void socketClosed();
void socketError(QAbstractSocket::SocketError);
void socketClosedCallback();
diff --git a/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
index cc508b6..10550ae 100644
--- a/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
+++ b/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
@@ -110,7 +110,7 @@ void SocketStreamHandlePrivate::close()
m_socket->close();
}
-void SocketStreamHandlePrivate::socketSentdata()
+void SocketStreamHandlePrivate::socketSentData()
{
if (m_streamHandle)
m_streamHandle->sendPendingData();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list