Changeset 54854 in webkit

Timestamp:

Feb 16, 2010 6:11:38 PM (14 years ago)

Author:

ariya@webkit.org

Message:

2010-02-16 Ariya Hidayat <​ariya.hidayat@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):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -321 +321 @@
             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)),

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-02-16  Ariya Hidayat  <ariya.hidayat@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@nokia.com>