diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qzip.cpp | 6 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qsidebar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 3 |
6 files changed, 6 insertions, 13 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 8b6dfc6932..6698b140af 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -857,7 +857,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa variant() + \sa QUuid::variant() */ /*! @@ -871,7 +871,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa variant() + \sa QUuid::variant() */ /*! diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 6053466148..be002167cb 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -795,12 +795,6 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const */ /*! - \variable FileInfo::d - \internal - private pointer. -*/ - -/*! \class QZipReader \internal \since 4.5 diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index d8e63547b7..a01ccc67f6 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -32,7 +32,7 @@ use OpenGL in Qt applications. \warning This module should not be used anymore for new code. Please - use the corresponding OpenGL classes in \l{Qt Gui}. + use the corresponding OpenGL classes in \l{Qt GUI}. OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index 824db48754..80742dd588 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -35,7 +35,7 @@ use OpenGL in Qt applications. \warning This module should not be used anymore for new code. Please - use the corresponding OpenGL classes in \l{Qt Gui}. + use the corresponding OpenGL classes in \l{Qt GUI}. OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index be3c060ba1..f883705cc3 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -60,6 +60,8 @@ void QSideBarDelegate::initStyleOption(QStyleOptionViewItem *option, } /*! + \internal + \class QUrlModel QUrlModel lets you have indexes from a QFileSystemModel to a list. When QFileSystemModel changes them QUrlModel will automatically update. diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index af2a66a838..89fd3d3d57 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3030,9 +3030,6 @@ void QComboBox::mousePressEvent(QMouseEvent *e) d->showPopupFromMouseEvent(e); } -/*! - \reimp -*/ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e) { Q_Q(QComboBox); |