diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 22:10:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 22:10:14 (GMT) |
| commit | 47cd6aa2ca55484c6549aa8d37801fdf7eaf05f7 (patch) | |
| tree | b0426841ac3de70f2bfcc59a3a5b5525ab058333 /src/plugins | |
| parent | a17339e943f21bb6c6e16884f716dd9ab8f94938 (diff) | |
| parent | 2a61c936bab8fb932568338d501d2b360fdb37ea (diff) | |
| download | Qt-47cd6aa2ca55484c6549aa8d37801fdf7eaf05f7.zip Qt-47cd6aa2ca55484c6549aa8d37801fdf7eaf05f7.tar.gz Qt-47cd6aa2ca55484c6549aa8d37801fdf7eaf05f7.tar.bz2 | |
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.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 4 |
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 */ |