Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (95 commits)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  ...

1 files changed, 3 insertions, 0 deletions

diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index 0bef4a6..a70f56b 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -600,5 +600,8 @@ void QFutureWatcherBase::setPaused(bool) { }
 void QFutureWatcherBase::pause() { }
 void QFutureWatcherBase::resume() { }
 void QFutureWatcherBase::togglePaused() { }
+bool QFutureWatcherBase::event(QEvent *) { return false; }
+void QFutureWatcherBase::connectNotify(const char *) { }
+void QFutureWatcherBase::disconnectNotify(const char *) { }
 
 #endif // QT_NO_QFUTURE