[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
yael.aharon at nokia.com
yael.aharon at nokia.com
Thu Apr 8 00:33:47 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 99af0929f82824c3e9e3d00f84cba9f54108ceb1
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 12 02:31:59 2009 +0000
WebKit/qt: Unreviewed build fix for Qt versions < 4.6.
* tests/qwebframe/tst_qwebframe.cpp:
* tests/qwebview/tst_qwebview.cpp:
WebKitTools: Unreviewed build fix for Qt versions < 4.6.
Guard every slot individually with #ifdef.
* DumpRenderTree/qt/EventSenderQt.cpp:
* DumpRenderTree/qt/EventSenderQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 16953da..5369e5c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-11 Yael Aharon <yael.aharon at nokia.com>
+
+ Unreviewed build fix for Qt versions < 4.6.
+
+ * tests/qwebframe/tst_qwebframe.cpp:
+ * tests/qwebview/tst_qwebview.cpp:
+ (tst_QWebView::reusePage):
+
2009-12-11 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Tor Arne Vestbø.
diff --git a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 7c13fd0..e14faa3 100644
--- a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2719,7 +2719,11 @@ void tst_QWebFrame::evaluateWillCauseRepaint()
view.setHtml(html);
view.show();
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
QTest::qWaitForWindowShown(&view);
+#else
+ QTest::qWait(2000);
+#endif
view.page()->mainFrame()->evaluateJavaScript(
"document.getElementById('junk').style.display = 'none';");
diff --git a/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/WebKit/qt/tests/qwebview/tst_qwebview.cpp
index bd2f185..f0fdffa 100644
--- a/WebKit/qt/tests/qwebview/tst_qwebview.cpp
+++ b/WebKit/qt/tests/qwebview/tst_qwebview.cpp
@@ -136,14 +136,22 @@ void tst_QWebView::reusePage()
}
view1->show();
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
QTest::qWaitForWindowShown(view1);
+#else
+ QTest::qWait(2000);
+#endif
delete view1;
QVERIFY(page != 0); // deleting view must not have deleted the page, since it's not a child of view
QWebView *view2 = new QWebView;
view2->setPage(page);
view2->show(); // in Windowless mode, you should still be able to see the plugin here
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
QTest::qWaitForWindowShown(view2);
+#else
+ QTest::qWait(2000);
+#endif
delete view2;
delete page; // must not crash
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4f658fe..34bccaf 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-11 Yael Aharon <yael.aharon at nokia.com>
+
+ Unreviewed build fix for Qt versions < 4.6.
+ Guard every slot individually with #ifdef.
+
+ * DumpRenderTree/qt/EventSenderQt.cpp:
+ (EventSender::addTouchPoint):
+ (EventSender::updateTouchPoint):
+ (EventSender::touchStart):
+ (EventSender::touchMove):
+ (EventSender::touchEnd):
+ (EventSender::clearTouchPoints):
+ (EventSender::releaseTouchPoint):
+ (EventSender::sendTouchEvent):
+ * DumpRenderTree/qt/EventSenderQt.h:
+
2009-12-11 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index bc6fc32..b8dd45b 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -251,59 +251,72 @@ void EventSender::scheduleAsynchronousClick()
QApplication::postEvent(m_page, event2);
}
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-
void EventSender::addTouchPoint(int x, int y)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
int id = m_touchPoints.count();
QTouchEvent::TouchPoint point(id);
m_touchPoints.append(point);
updateTouchPoint(id, x, y);
m_touchPoints[id].setState(Qt::TouchPointPressed);
+#endif
}
void EventSender::updateTouchPoint(int index, int x, int y)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
if (index < 0 || index >= m_touchPoints.count())
return;
QTouchEvent::TouchPoint &p = m_touchPoints[index];
p.setPos(QPointF(x, y));
p.setState(Qt::TouchPointMoved);
+#endif
}
void EventSender::touchStart()
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
sendTouchEvent(QEvent::TouchBegin);
+#endif
}
void EventSender::touchMove()
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
sendTouchEvent(QEvent::TouchUpdate);
+#endif
}
void EventSender::touchEnd()
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
for (int i = 0; i < m_touchPoints.count(); ++i)
m_touchPoints[i].setState(Qt::TouchPointReleased);
sendTouchEvent(QEvent::TouchEnd);
+#endif
}
void EventSender::clearTouchPoints()
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
m_touchPoints.clear();
+#endif
}
void EventSender::releaseTouchPoint(int index)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
if (index < 0 || index >= m_touchPoints.count())
return;
m_touchPoints[index].setState(Qt::TouchPointReleased);
+#endif
}
void EventSender::sendTouchEvent(QEvent::Type type)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
QTouchEvent event(type);
event.setTouchPoints(m_touchPoints);
QApplication::sendEvent(m_page, &event);
@@ -316,9 +329,8 @@ void EventSender::sendTouchEvent(QEvent::Type type)
++it;
}
}
-}
-
#endif
+}
QWebFrame* EventSender::frameUnderMouse() const
{
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
index 31a8c56..95e182d 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
@@ -58,7 +58,6 @@ public slots:
void clearKillRing() {}
void contextClick();
void scheduleAsynchronousClick();
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
void addTouchPoint(int x, int y);
void updateTouchPoint(int index, int x, int y);
void touchStart();
@@ -66,7 +65,6 @@ public slots:
void touchEnd();
void clearTouchPoints();
void releaseTouchPoint(int index);
-#endif
private:
void sendTouchEvent(QEvent::Type);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list