diff options
| -rw-r--r-- | doc/src/development/designer-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qmargins.cpp | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qdrawutil.cpp | 3 |
5 files changed, 5 insertions, 9 deletions
diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index bdadcf7..b78d261 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -1569,7 +1569,6 @@ \raw HTML </div> \endraw - \table \section2 Creating a Menu Entry @@ -1630,7 +1629,6 @@ Since actions can be represented by menu entries and toolbar buttons, they can be moved between menus and toolbars. - \target AddingAnAction \raw HTML <div style="float: right; margin-left: 2em"> \endraw diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 314dfb2..fafbec5 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2804,6 +2804,6 @@ \note: in 4.6, cursor navigation is only implemented for Symbian OS. On other platforms, it behaves as NavigationModeNone. - \sa QApplication::setNavigationMode - \sa QApplication::navigationMode + \sa QApplication::setNavigationMode() + \sa QApplication::navigationMode() */ diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp index 72fbd61..b5e5ebd 100644 --- a/src/corelib/tools/qmargins.cpp +++ b/src/corelib/tools/qmargins.cpp @@ -58,9 +58,6 @@ QT_BEGIN_NAMESPACE The isNull() function returns true only if all margins are set to zero. QMargin objects can be streamed as well as compared. - - \sa qDrawBorderPixmap() - */ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 1fd2d39..0ff7314 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -4773,7 +4773,7 @@ void QApplicationPrivate::emitLastWindowClosed() #ifdef QT_KEYPAD_NAVIGATION /*! - Sets what kind of focus navigation Qt should use. + Sets the kind of focus navigation Qt should use to \a mode. This feature is available in Qt for Embedded Linux, Symbian and Windows CE only. diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index c4a9373..0a82a9f 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -1066,8 +1066,9 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, /*! \fn void qDrawBorderPixmap(QPainter *painter, const QRect &target, const QMargins &margins, const QPixmap &pixmap) - \since 4.6 \relates <qdrawutil.h> + \since 4.6 + \overload Draws the given \a pixmap into the given \a target rectangle, using the given \a painter. The pixmap will be split into nine segments and drawn |