Changeset 48221

Show
Ignore:
Timestamp:
09/09/09 14:11:35 (6 months ago)
Author:
kenneth@webkit.org
Message:

Implement some virtual event methods so that we can fix
event-related bugs in Qt patch releases.

Patch by Kenneth Rohde Christiansen < kenneth@webkit.org> on 2009-09-09
Reviewed by Tor Arne Vestbø.

* Api/qwebgraphicsitem.cpp:
(QWebGraphicsItem::sceneEvent):
(QWebGraphicsItem::event):
* Api/qwebgraphicsitem.h:

Location:
trunk/WebKit/qt
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/qt/Api/qwebgraphicsitem.cpp

    r48219 r48221  
    161161{ 
    162162    d->page->mainFrame()->render(painter, option->exposedRect.toRect()); 
     163} 
     164 
     165/*! \reimp 
     166*/ 
     167bool QWebGraphicsItem::sceneEvent(QEvent* event) 
     168{ 
     169    // Swallow reimplementation in order to allows fixing event-related bugs in patch releases 
     170    return QGraphicsWidget::sceneEvent(event); 
     171} 
     172 
     173/*! \reimp 
     174*/ 
     175bool QWebGraphicsItem::event(QEvent* event) 
     176{ 
     177    // Swallow reimplementation in order to allows fixing event-related bugs in patch releases 
     178    return QObject::event(event); 
    163179} 
    164180 

  • trunk/WebKit/qt/Api/qwebgraphicsitem.h

    r48219 r48221  
    8686    virtual void updateGeometry(); 
    8787    virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0); 
     88    virtual bool event(QEvent*); 
    8889 
    8990public Q_SLOTS: 
    … …  
    130131    virtual bool focusNextPrevChild(bool next); 
    131132 
     133    virtual bool sceneEvent(QEvent*); 
     134 
    132135private: 
    133136    Q_PRIVATE_SLOT(d, void _q_doScroll(int dx, int dy, const QRect&)) 

  • trunk/WebKit/qt/ChangeLog

    r48219 r48221  
     12009-09-09  Kenneth Rohde Christiansen  <kenneth@webkit.org> 
     2 
     3        Reviewed by Tor Arne Vestbø. 
     4 
     5        Implement some virtual event methods so that we can fix 
     6        event-related bugs in Qt patch releases. 
     7 
     8        * Api/qwebgraphicsitem.cpp: 
     9        (QWebGraphicsItem::sceneEvent): 
     10        (QWebGraphicsItem::event): 
     11        * Api/qwebgraphicsitem.h: 
     12 
    1132009-09-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>, Antonio Gomes  <antonio.gomes@openbossa.org> 
    214