From a8714548d18884f3dc90cb51b251bc1f612db6e2 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 17 Dec 2014 15:20:29 +0100 Subject: Doc: corrected broken links qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-43115 Change-Id: Ib441326083294a6d59d75510142b1481f7b0bc35 Reviewed-by: Topi Reiniö Reviewed-by: Martin Smith --- src/dbus/doc/src/qtdbus-module.qdoc | 4 ++-- src/gui/image/qimage.cpp | 2 +- src/gui/kernel/qevent.cpp | 2 -- src/gui/kernel/qopenglcontext.cpp | 12 +++++------- src/gui/kernel/qstylehints.cpp | 2 +- src/sql/doc/src/sql-driver.qdoc | 5 ++--- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/dbus/doc/src/qtdbus-module.qdoc b/src/dbus/doc/src/qtdbus-module.qdoc index ac9cac428b..cd9365aac8 100644 --- a/src/dbus/doc/src/qtdbus-module.qdoc +++ b/src/dbus/doc/src/qtdbus-module.qdoc @@ -29,7 +29,7 @@ \module QtDBus \title Qt D-Bus C++ Classes \brief The Qt D-Bus module is a Unix-only library that you can use - to perform Inter-Process Communication using the \l{D-Bus} protocol. + to perform Inter-Process Communication using the \l{Qt D-Bus}{D-Bus} protocol. \ingroup modules \qtvariable dbus @@ -61,6 +61,6 @@ directory. When installing Qt from source, this module is built when Qt's tools are built. - See the \l {D-Bus} page for detailed information on + See the \l {Qt D-Bus}{D-Bus} page for detailed information on how to use this module. */ diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index ea23954a49..887a7c29eb 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -314,7 +314,7 @@ bool QImageData::checkForAlphaPixels() const sharing}. QImage objects can also be streamed and compared. \note If you would like to load QImage objects in a static build of Qt, - refer to the \l{How To Create Qt Plugins#Static Plugins}{Plugin HowTo}. + refer to the \l{How To Create Qt Plugins}{Plugin HowTo}. \warning Painting on a QImage with the format QImage::Format_Indexed8 is not supported. diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index a8c34a8871..60e7b97f12 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -283,7 +283,6 @@ QMouseEvent::~QMouseEvent() \sa Qt::MouseEventSource \sa QGraphicsSceneMouseEvent::source() - \sa QGraphicsSceneMouseEvent::setSource() */ Qt::MouseEventSource QMouseEvent::source() const { @@ -299,7 +298,6 @@ Qt::MouseEventSource QMouseEvent::source() const \sa Qt::MouseEventFlag \sa QGraphicsSceneMouseEvent::flags() - \sa QGraphicsSceneMouseEvent::setFlags() */ Qt::MouseEventFlags QMouseEvent::flags() const { diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index c01e1c95dd..5918f30660 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -519,7 +519,7 @@ void QOpenGLContext::setScreen(QScreen *screen) value type. These classes can be found in the QtPlatformHeaders module. When create() is called with native handles set, the handles' ownership are - not taken, meaning that destroy() will not destroy the native context. + not taken, meaning that \c destroy() will not destroy the native context. \note Some frameworks track the current context and surfaces internally. Making the adopted QOpenGLContext current via Qt will have no effect on such @@ -583,9 +583,9 @@ QVariant QOpenGLContext::nativeHandle() const be used with makeCurrent(), swapBuffers(), etc. \note If the context is already created, this function will first call - destroy(), and then create a new OpenGL context. + \c destroy(), and then create a new OpenGL context. - \sa makeCurrent(), destroy(), format() + \sa makeCurrent(), format() */ bool QOpenGLContext::create() { @@ -613,7 +613,7 @@ bool QOpenGLContext::create() destroying the underlying platform context frees any state associated with the context. - After destroy() has been called, you must call create() if you wish to + After \c destroy() has been called, you must call create() if you wish to use the context again. \note This implicitly calls doneCurrent() if the context is current. @@ -658,10 +658,8 @@ void QOpenGLContext::destroy() /*! Destroys the QOpenGLContext object. - This implicitly calls destroy(), so if this is the current context for the + This implicitly calls \c destroy(), so if this is the current context for the thread, doneCurrent() is also called. - - \sa destroy() */ QOpenGLContext::~QOpenGLContext() { diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index 65a710c3f7..125e59aa5f 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/src/gui/kernel/qstylehints.cpp @@ -88,7 +88,7 @@ public: Access to these parameters are useful when implementing custom user interface components, in that they allow the components to exhibit the same behaviour and feel as other components. - \sa QGuiApplication::styleHints(), QPlatformTheme + \sa QGuiApplication::styleHints() */ QStyleHints::QStyleHints() : QObject(*new QStyleHintsPrivate(), 0) diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 71d2fb4f85..e2ffdaea2c 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -713,9 +713,8 @@ \snippet code/doc_src_sql-driver.cpp 31 - the problem is usually that the plugin had the wrong \l{Deploying - Plugins#The Build Key}{build key}. This might require removing an - entry from the \l{Deploying Plugins#The Plugin Cache} {plugin cache}. + the problem is usually that the plugin had the wrong build key. + This might require removing an entry from the plugin cache. \target development \section1 How to Write Your Own Database Driver -- cgit v1.2.3