summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-04-27 18:04:09 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-04-27 18:06:36 (GMT)
commit7cbcda51b464d79f3a4c29c12743067b5a603502 (patch)
tree49953614601a0b29bb9ad6f2bd0b92099f655054 /src/plugins
parent0c47c08be649d17b7fdd1de1f87a325b7c051113 (diff)
downloadQt-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/plugins')
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp4
1 files changed, 4 insertions, 0 deletions
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 */