diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-27 18:04:09 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-04-27 18:06:36 (GMT) |
| commit | 7cbcda51b464d79f3a4c29c12743067b5a603502 (patch) | |
| tree | 49953614601a0b29bb9ad6f2bd0b92099f655054 /src | |
| parent | 0c47c08be649d17b7fdd1de1f87a325b7c051113 (diff) | |
| download | Qt-7cbcda51b464d79f3a4c29c12743067b5a603502.zip Qt-7cbcda51b464d79f3a4c29c12743067b5a603502.tar.gz Qt-7cbcda51b464d79f3a4c29c12743067b5a603502.tar.bz2 | |
Fix the compilation with QT_NO_TOOLTIP
Merge-request: 579
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsproxywidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 4 |
2 files changed, 6 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; } diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index daa827e..f39d538 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -605,7 +605,11 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa /*! \reimp */ QString QAccessibleDisplay::imageDescription() { +#ifndef QT_NO_TOOLTIP return widget()->toolTip(); +#else + return QString::null; +#endif } /*! \reimp */ |