[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 631f7d1cf7fca6d05aef4c3f5ac7c257e279e50b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 27 18:35:14 2002 +0000

    	- fixed 3060487 -- error connecting member slot to signal (KWQObject)
    
            * kwq/KWQObject.mm: (QObject::connect): Add slotShowDocument to the list of slots that
    	we don't care about hooking up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a8f2564..523d7db 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-27  Darin Adler  <darin at apple.com>
+
+	- fixed 3060487 -- error connecting member slot to signal (KWQObject)
+
+        * kwq/KWQObject.mm: (QObject::connect): Add slotShowDocument to the list of slots that
+	we don't care about hooking up.
+
 2002-09-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a8f2564..523d7db 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-09-27  Darin Adler  <darin at apple.com>
+
+	- fixed 3060487 -- error connecting member slot to signal (KWQObject)
+
+        * kwq/KWQObject.mm: (QObject::connect): Add slotShowDocument to the list of slots that
+	we don't care about hooking up.
+
 2002-09-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a8f2564..523d7db 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-09-27  Darin Adler  <darin at apple.com>
+
+	- fixed 3060487 -- error connecting member slot to signal (KWQObject)
+
+        * kwq/KWQObject.mm: (QObject::connect): Add slotShowDocument to the list of slots that
+	we don't care about hooking up.
+
 2002-09-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index a3847ff..cf598aa 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -78,6 +78,7 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
             && !KWQNamesMatch(member, SLOT(slotLoaderRequestStarted(khtml::DocLoader *, khtml::CachedObject *)))
             && !KWQNamesMatch(member, SLOT(slotRedirection(KIO::Job *, const KURL &)))
             && !KWQNamesMatch(member, SLOT(slotScrollBarMoved()))
+            && !KWQNamesMatch(member, SLOT(slotShowDocument(const QString &, const QString &)))
             && !KWQNamesMatch(member, SLOT(slotViewCleared()))
             && !KWQNamesMatch(member, SLOT(slotWidgetDestructed()))
             )

-- 
WebKit Debian packaging