[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e6a33ccb72c6c31b22b1efcd8571d2ed426e8ebb
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 14:23:04 2010 +0000

    2010-09-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Remove support for Qt 4.5
            https://bugs.webkit.org/show_bug.cgi?id=46718
    
            Remove the code for versions of Qt prior to 4.6.
    
            * UIProcess/API/qt/qgraphicswkview.cpp:
            (QGraphicsWKView::event):
            * UIProcess/API/qt/qwkpage.cpp:
            * UIProcess/API/qt/qwkpage_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68512 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a24969b..8b677f5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Remove support for Qt 4.5
+        https://bugs.webkit.org/show_bug.cgi?id=46718
+
+        Remove the code for versions of Qt prior to 4.6.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::event):
+        * UIProcess/API/qt/qwkpage.cpp:
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2010-09-28  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 0d8d7cf..80fcebc 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -154,12 +154,10 @@ QVariant QGraphicsWKView::itemChange(GraphicsItemChange change, const QVariant&
 */
 bool QGraphicsWKView::event(QEvent* event)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     if (event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchUpdate) {
         touchEvent(static_cast<QTouchEvent*>(event));
         return true;
     }
-#endif 
 
     // Here so that it can be reimplemented without breaking ABI.
     return QGraphicsWidget::event(event);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index dfd52f4..4060813 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -35,13 +35,11 @@
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QStyle>
+#include <QTouchEvent>
 #include <QtDebug>
 #include <WebKit2/WKFrame.h>
 #include <WebKit2/WKRetainPtr.h>
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-#include <QTouchEvent>
-#endif
 
 using namespace WebKit;
 using namespace WebCore;
@@ -229,16 +227,12 @@ void QWKPagePrivate::_q_webActionTriggered(bool checked)
 }
 #endif // QT_NO_ACTION
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-
 void QWKPagePrivate::touchEvent(QTouchEvent* event)
 {
     WebTouchEvent touchEvent = WebEventFactory::createWebTouchEvent(event);
     page->handleTouchEvent(touchEvent);
 }
 
-#endif
-
 QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
     : d(new QWKPagePrivate(this, namespaceRef))
 {
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index ea415c4..ad9f13b 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -73,9 +73,7 @@ public:
 
     void _q_webActionTriggered(bool checked);
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     void touchEvent(QTouchEvent*);
-#endif
 
     QWKPage* q;
 

-- 
WebKit Debian packaging