diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-16 12:47:11 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-16 12:47:11 (GMT) |
| commit | 8c468a5d8130a974edd803cb58f67e405c938a83 (patch) | |
| tree | 1c73ef048e6e4b3760ab276b5cc7bf1e5243a803 /src/gui | |
| parent | 5a52d83e9464d31cae31fbc0482a68a183a44077 (diff) | |
| parent | d65bff4c94fb11bbad02420459a9375621051823 (diff) | |
| download | Qt-8c468a5d8130a974edd803cb58f67e405c938a83.zip Qt-8c468a5d8130a974edd803cb58f67e405c938a83.tar.gz Qt-8c468a5d8130a974edd803cb58f67e405c938a83.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/accessible/qaccessible.cpp | 10 | ||||
| -rw-r--r-- | src/gui/effects/qgraphicseffect.cpp | 13 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index a527ee7..a11ebea 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -984,6 +984,16 @@ const QAccessibleInterface *other, int otherChild) const */ /*! + \fn QAccessibleActionInterface *QAccessibleInterface::actionInterface() + \internal +*/ + +/*! + \fn QAccessibleImageInterface *QAccessibleInterface::imageInterface() + \internal +*/ + +/*! \class QAccessibleEvent \brief The QAccessibleEvent class is used to query addition accessibility information about complex widgets. diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index 3fca319..239e29c 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -135,19 +135,6 @@ QT_BEGIN_NAMESPACE */ /*! - \enum QGraphicsEffectSource::PixmapPadMode - - This enum describes how much of the effect will be rendered to a pixmap - created using the pixmap() function. - - \value NoExpandPadMode The pixmap is the size of the widget or graphics item. - \value ExpandToTransparentBorderPadMode The pixmap is expanded to include - the widget or graphics item plus a transparent border. - \value ExpandToEffectRectPadMode The pixmap is expanded to include the widget - or graphics item and the effect. -*/ - -/*! \internal */ QGraphicsEffectSource::QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent) |