Doc: Corrected link issues in qtbase

Task-number: QTBUG-43810
Change-Id: I0a019becc53b222cb6a7df1fafdccd57aca5b598
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Nico Vertriest 2015-07-07 15:29:05 +02:00
parent dfb55da5d6
commit 9588e1bba3
15 changed files with 18 additions and 23 deletions

View File

@ -728,8 +728,7 @@
\section2 Creating and Moving Xcode Projects
Developers on OS X can take advantage of the qmake support for Xcode
project files, as described in
\l{Qt is OS X Native#Development Tools}{Qt is OS X Native},
project files, as described in \l{Additional Command-Line Options},
by running qmake to generate an Xcode project from an existing qmake project
file. For example:

View File

@ -2858,7 +2858,7 @@ QTextStream &endl(QTextStream &stream)
/*!
\relates QTextStream
Calls \l{QTextStream::flush()}{flush()} on \a stream and returns \a stream.
Calls QTextStream::flush() on \a stream and returns \a stream.
\sa endl(), reset(), {QTextStream manipulators}
*/

View File

@ -1548,12 +1548,13 @@ bool QMetaObject::invokeMethod(QObject *obj,
/*!
\fn QMetaObject::Connection &QMetaObject::Connection::operator=(Connection &&other)
Move-assigns \a other to this object.
Move-assigns \a other to this object, and returns a reference.
*/
/*!
\fn QMetaObject::Connection::Connection(Connection &&o)
Move-constructs a Connection instance, making it point to the same object that \a o was pointing to.
Move-constructs a Connection instance, making it point to the same object
that \a o was pointing to.
*/
/*!

View File

@ -37,7 +37,8 @@ depends += \
qtqml \
qtquick \
qtwidgets \
qtdoc
qtdoc \
qmake
headerdirs += ..

View File

@ -313,7 +313,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}{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.

View File

@ -1170,7 +1170,7 @@ QImageIOHandler::Transformations QImageReader::transformation() const
Sets if images returned by read() should have transformation metadata automatically applied.
\sa autoTransform(), transform(), read()
\sa autoTransform(), transformation(), read()
*/
void QImageReader::setAutoTransform(bool enabled)
{

View File

@ -148,8 +148,6 @@ QMatrix4x4::QMatrix4x4(const float *values)
top-most 4 rows of \a matrix. If \a matrix has less than 4 columns
or rows, the remaining elements are filled with elements from the
identity matrix.
\sa QMatrix4x4(const QGenericMatrix &)
*/
/*!

View File

@ -26,7 +26,7 @@ qhp.QtNetwork.subprojects.classes.sortPages = true
tagfile = ../../../doc/qtnetwork/qtnetwork.tags
depends += qtcore qtgui qtdoc
depends += qtcore qtgui qtdoc qmake
headerdirs += ..

View File

@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
elliptic-curve cipher algorithms.
Elliptic curves can be constructed from a "short name" (SN) (fromShortName()),
and by a call to QSslSocket::supportedEllipticCurves().
and by a call to QSslConfiguration::supportedEllipticCurves().
QSslEllipticCurve instances can be compared for equality and can be used as keys
in QHash and QSet. They cannot be used as key in a QMap.
@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
Constructs an invalid elliptic curve.
\sa isValid(), QSslSocket::supportedEllipticCurves()
\sa isValid(), QSslConfiguration::supportedEllipticCurves()
*/
/*!
@ -136,7 +136,6 @@ QT_BEGIN_NAMESPACE
\relates QSslEllipticCurve
Returns true if the curve \a lhs represents the same curve of \a rhs;
false otherwise.
*/
/*!

View File

@ -257,7 +257,6 @@ int QSslPreSharedKeyAuthenticator::maximumPreSharedKeyLength() const
identity hint, identity, pre shared key, maximum length for the identity
and maximum length for the pre shared key.
\sa operator!=(const QSslPreSharedKeyAuthenticator &lhs, const QSslPreSharedKeyAuthenticator &rhs)
*/
bool operator==(const QSslPreSharedKeyAuthenticator &lhs, const QSslPreSharedKeyAuthenticator &rhs)
{
@ -277,7 +276,6 @@ bool operator==(const QSslPreSharedKeyAuthenticator &lhs, const QSslPreSharedKey
Returns true if the authenticator object \a lhs is different than \a rhs;
false otherwise.
\sa operator==(const QSslPreSharedKeyAuthenticator &lhs, const QSslPreSharedKeyAuthenticator &rhs)
*/
QT_END_NAMESPACE

View File

@ -19,7 +19,7 @@ exampledirs += ../../../examples/opengl \
imagedirs += images \
../../../examples/opengl/doc/images
depends += qtdoc qtcore qtgui qtwidgets
depends += qtdoc qtcore qtgui qtwidgets qmake
examplesinstallpath = opengl

View File

@ -25,7 +25,7 @@ qhp.QtSql.subprojects.classes.selectors = class fake:headerfile
qhp.QtSql.subprojects.classes.sortPages = true
tagfile = ../../../doc/qtsql/qtsql.tags
depends += qtcore qtwidgets qtdoc
depends += qtcore qtwidgets qtdoc qmake
headerdirs += ..

View File

@ -90,9 +90,8 @@
\brief Basic set of UI components
This is a listing of a list of UI components implemented by QML types. These
files are available for general import and they are based off the \l{Qt
Quick Code Samples}.
files are available for general import and they are based on the
\l{Qt Quick Examples and Tutorials}{Qt Quick Code Samples}.
This module is part of the \l{componentset}{UIComponents} example.
*/

View File

@ -26,7 +26,7 @@ qhp.QtWidgets.subprojects.classes.sortPages = true
tagfile = ../../../doc/qtwidgets/qtwidgets.tags
depends += qtcore qtgui qtdoc qtsql qtdesigner qtquick
depends += qtcore qtgui qtdoc qtsql qtdesigner qtquick qmake qtsvg
headerdirs += ..

View File

@ -26,7 +26,7 @@ qhp.QtXml.subprojects.classes.sortPages = true
tagfile = ../../../doc/qtxml/qtxml.tags
depends += qtcore qtnetwork qtdoc qtwidgets
depends += qtcore qtnetwork qtdoc qtwidgets qmake
headerdirs += ..