diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/qt/WidgetQt.cpp | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/qt/WidgetQt.cpp')
-rw-r--r-- | WebCore/platform/qt/WidgetQt.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/WebCore/platform/qt/WidgetQt.cpp b/WebCore/platform/qt/WidgetQt.cpp index 9f1a1e8..0fb6c37 100644 --- a/WebCore/platform/qt/WidgetQt.cpp +++ b/WebCore/platform/qt/WidgetQt.cpp @@ -81,8 +81,15 @@ void Widget::setFocus() void Widget::setCursor(const Cursor& cursor) { #ifndef QT_NO_CURSOR - if (QWidget* widget = root()->hostWindow()->platformWindow()) - QCoreApplication::postEvent(widget, new SetCursorEvent(cursor.impl())); + QWidget* widget = root()->hostWindow()->platformWindow(); + + if (!widget) + return; + + if (!cursor.impl().bitmap() && widget->cursor().shape() == cursor.impl().shape()) + return; + + QCoreApplication::postEvent(widget, new SetCursorEvent(cursor.impl())); #endif } |