[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[ariya at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 54fed5199fb6e290328a1e8cf5401fe253dddd0a
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 02:11:38 2010 +0000

    2010-02-16  Ariya Hidayat  <ariya.hidayat at gmail.com>
    
            Reviewed by Laszlo Gombos.
    
            Fix building with Qt < 4.6.
            https://bugs.webkit.org/show_bug.cgi?id=34885
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 5f49463..9720e0c 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -320,8 +320,13 @@ void QGraphicsWebViewPrivate::updateResizesToContentsForPage()
         if (!page->preferredContentsSize().isValid())
             page->setPreferredContentsSize(QSize(960, 800));
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
         QObject::connect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
             q, SLOT(_q_contentsSizeChanged(const QSize&)), Qt::UniqueConnection);
+#else
+        QObject::connect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
+            q, SLOT(_q_contentsSizeChanged(const QSize&)));
+#endif
     } else {
         QObject::disconnect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
                          q, SLOT(_q_contentsSizeChanged(const QSize&)));
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2568504..4d4f651 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16  Ariya Hidayat  <ariya.hidayat at gmail.com>
+
+        Reviewed by Laszlo Gombos.
+
+        Fix building with Qt < 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=34885
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
+
 2010-02-16  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Unreviewed Symbian build fix.

-- 
WebKit Debian packaging