diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
| commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
| tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /src/gui/accessible | |
| parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
| parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) | |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/gui/accessible')
| -rw-r--r-- | src/gui/accessible/qaccessible.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 5f61634ba2..a3014cb858 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -64,7 +64,7 @@ class QWindow; // We need to inherit QObject to expose the enums to QML. class Q_GUI_EXPORT QAccessible -#ifndef qdoc +#ifndef Q_QDOC :public QObject #endif { @@ -269,7 +269,7 @@ public: StaticText = 0x00000029, EditableText = 0x0000002A, // Editable, selectable, etc. Button = 0x0000002B, -#ifndef qdoc +#ifndef Q_QDOC PushButton = Button, // deprecated #endif CheckBox = 0x0000002C, |