diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 21:53:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 21:53:44 (GMT) |
| commit | f5b2318940db51e0f76e7673116050df8e4d8e3c (patch) | |
| tree | 4ad662180820973dd137118f3a8635d19c1ed08e /src/gui/accessible/qaccessible_mac_cocoa.mm | |
| parent | 100a56f323a008edb0a451ab052f1a0d5edcc547 (diff) | |
| parent | 8d88f35f5f5c06277e2a54b6aea48b7f3e2e1c51 (diff) | |
| download | Qt-f5b2318940db51e0f76e7673116050df8e4d8e3c.zip Qt-f5b2318940db51e0f76e7673116050df8e4d8e3c.tar.gz Qt-f5b2318940db51e0f76e7673116050df8e4d8e3c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (26 commits)
Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.
Fixed make runonphone that looked for the package in the wrong place.
Fixed several problems with the postlinker for Symbian (elf2e32).
Don't crash when cleaning the uninitialized fontdatabase (Symbian)
Revert "Fixing the race condition in event dispatcher implementation on"
Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Fixed memory restrictions not being passed on to elf2e32.
Allow TLW translucency on Symbian without Qt::FramelessWindowHint
Updated UIDs for spectrum demo
Ensure that compiling with the no debug/warning output defines works
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
Phonon(qt7); Don't try and display video frames when audio only.
Audio(osx); Fix period size calculation.
Audio(osx); refactor input period conversion
Audio(osx); Fix audio format converters.
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
...
Diffstat (limited to 'src/gui/accessible/qaccessible_mac_cocoa.mm')
| -rw-r--r-- | src/gui/accessible/qaccessible_mac_cocoa.mm | 4 |
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); |