diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
| commit | f4900d340a4c620b56871995741696d28e53c167 (patch) | |
| tree | 66d4ed6e4e8012e8a534717e87bf15cf8a992652 /src/gui/accessible | |
| parent | 7c33ae6a7bbbd42ce70acf77aa55c1bc2a23c8ec (diff) | |
| parent | 843de37bca944110fdf3aab161d680e3845d2dd2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qmacstyle_mac.mm
Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
Diffstat (limited to 'src/gui/accessible')
| -rw-r--r-- | src/gui/accessible/qaccessible.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 016e9b6d07..96fc7c031b 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#ifndef QT_NO_ACCESSIBILITY #ifndef QACCESSIBLE_H #define QACCESSIBLE_H @@ -677,3 +678,4 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r QT_END_NAMESPACE #endif // QACCESSIBLE_H +#endif //!QT_NO_ACCESSIBILITY |