Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix compilation with QT_NO_TEXTSTREAM
  Fix the compilation with QT_NO_TOOLTIP
  Add unit tests for a number of QList methods.
  Crash while dragging on Mac OS X (Cocoa)
  Doc & menubar hidden for QtDemo after switching back from fullscreen
  qdoc: Added breadcrumbs for class pages.
  QTabWidget documentMode not working correctly on Mac
  qdoc: Removed MacRefs for Xcode documentation stuff.
  Slight QList documentation fix.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index 1f89714..320395e 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -975,6 +975,7 @@ bool QGraphicsProxyWidget::eventFilter(QObject *object, QEvent *event)
                 d->styleChangeMode = QGraphicsProxyWidgetPrivate::NoMode;
             }
             break;
+#ifndef QT_NO_TOOLTIP
         case QEvent::ToolTipChange:
             // Propagate tooltip change to the proxy.
             if (!d->tooltipChangeMode) {
@@ -983,6 +984,7 @@ bool QGraphicsProxyWidget::eventFilter(QObject *object, QEvent *event)
                 d->tooltipChangeMode = QGraphicsProxyWidgetPrivate::NoMode;
             }
             break;
+#endif
         default:
             break;
         }