summaryrefslogtreecommitdiffstats
path: root/src/gui/accessible
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-06-24 11:14:21 (GMT)
committeraxis <qt-info@nokia.com>2010-06-24 11:14:21 (GMT)
commit447f2b410335730cd172a76abce184bacae186d2 (patch)
tree73d93ef871e99f03eedd69eeb0fa74228c1e33d3 /src/gui/accessible
parent5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (diff)
parent7ae5285132db6c435e91ab097f41097217d68a2c (diff)
downloadQt-447f2b410335730cd172a76abce184bacae186d2.zip
Qt-447f2b410335730cd172a76abce184bacae186d2.tar.gz
Qt-447f2b410335730cd172a76abce184bacae186d2.tar.bz2
Merge branch '4.6-s60' into 4.7-s60
Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/plugins/phonon/mmf/mmf.pro
Diffstat (limited to 'src/gui/accessible')
-rw-r--r--src/gui/accessible/qaccessible_mac_cocoa.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/accessible/qaccessible_mac_cocoa.mm b/src/gui/accessible/qaccessible_mac_cocoa.mm
index 1688404..ada927e 100644
--- a/src/gui/accessible/qaccessible_mac_cocoa.mm
+++ b/src/gui/accessible/qaccessible_mac_cocoa.mm
@@ -58,11 +58,15 @@ QT_BEGIN_NAMESPACE
//#define MAC_ACCESSIBILTY_DEVELOPER_MODE
+#ifndef QT_NO_DEBUG_STREAM
#ifdef MAC_ACCESSIBILTY_DEVELOPER_MODE
#define MAC_ACCESSIBILTY_DEBUG QT_PREPEND_NAMESPACE(qDebug)
#else
#define MAC_ACCESSIBILTY_DEBUG if (0) QT_PREPEND_NAMESPACE(qDebug)
#endif
+#else
+#define MAC_ACCESSIBILTY_DEBUG if (0) QT_PREPEND_NAMESPACE(QNoDebug)
+#endif
typedef QMap<QAccessible::Role, NSString *> QMacAccessibiltyRoleMap;
Q_GLOBAL_STATIC(QMacAccessibiltyRoleMap, qMacAccessibiltyRoleMap);