diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 22:25:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 22:25:20 (GMT) |
| commit | c0179a6f640a3a88550656884d0bb5065e6b048a (patch) | |
| tree | b19a62cb18bb73ab9c9ec848ccf2195d87251786 /src/gui/util/qsystemtrayicon_x11.cpp | |
| parent | c1be5360025d9620d731e920300a75459a1eb503 (diff) | |
| parent | 1407f3c1815addf6b9cac7503d38b670bbeab895 (diff) | |
| download | Qt-c0179a6f640a3a88550656884d0bb5065e6b048a.zip Qt-c0179a6f640a3a88550656884d0bb5065e6b048a.tar.gz Qt-c0179a6f640a3a88550656884d0bb5065e6b048a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the WebKit build
Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
Fixed compilation with QT_NO_WHEELEVENT
Take into account the solaris-cc-64-stlport mkspec
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ffae5e11181a3961193fa21ea405851cad714d4b )
Diffstat (limited to 'src/gui/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_x11.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp index a645050..82b4325 100644 --- a/src/gui/util/qsystemtrayicon_x11.cpp +++ b/src/gui/util/qsystemtrayicon_x11.cpp @@ -308,10 +308,12 @@ void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev) emit q->activated(QSystemTrayIcon::DoubleClick); } +#ifndef QT_NO_WHEELEVENT void QSystemTrayIconSys::wheelEvent(QWheelEvent *e) { QApplication::sendEvent(q, e); } +#endif bool QSystemTrayIconSys::event(QEvent *e) { |