AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: link issues in corelib

Browse Source 
Task-number: QTBUG-43115
Change-Id: Ia80802e698f16730698e9a90102f549fb35f9305
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Nico Vertriest 2014-12-04 15:14:18 +01:00
parent a8a00f646b
commit 24238e6a31
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/doc/src/external-resources.qdoc
View File

@ -55,3 +55,14 @@
\externalpage http://www.iana.org/assignments/character-sets/character-sets.xml \externalpage http://www.iana.org/assignments/character-sets/character-sets.xml
\title IANA character-sets encoding file \title IANA character-sets encoding file
*/ */
/*!
\externalpage http://doc-snapshot.qt-project.org/qt5-5.4/qtdesigner-manual.html
\title Using a Designer UI File in Your Application
*/
/*!
\externalpage http://doc-snapshot.qt-project.org/qt5-5.4/designer-widget-mode.html#the-property-editor
\title Qt Designer's Widget Editing Mode#The Property Editor
*/
*/

10
src/corelib/kernel/qobject.cpp
View File

@ -2741,9 +2741,9 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const char *sign
You can check if the QMetaObject::Connection is valid by casting it to a bool. You can check if the QMetaObject::Connection is valid by casting it to a bool.
This function works in the same way as This function works in the same way as
connect(const QObject *sender, const char *signal, \c {connect(const QObject *sender, const char *signal,
const QObject *receiver, const char *method, const QObject *receiver, const char *method,
Qt::ConnectionType type) Qt::ConnectionType type)}
but it uses QMetaMethod to specify signal and method. but it uses QMetaMethod to specify signal and method.
\sa connect(const QObject *sender, const char *signal, const QObject *receiver, const char *method, Qt::ConnectionType type) \sa connect(const QObject *sender, const char *signal, const QObject *receiver, const char *method, Qt::ConnectionType type)
@ -2996,7 +2996,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
otherwise returns \c false. otherwise returns \c false.
This function provides the same possibilities like This function provides the same possibilities like
disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method) \c {disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method) }
but uses QMetaMethod to represent the signal and the method to be disconnected. but uses QMetaMethod to represent the signal and the method to be disconnected.
Additionally this function returnsfalse and no signals and slots disconnected Additionally this function returnsfalse and no signals and slots disconnected
@ -4110,7 +4110,7 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
This macro associates extra information to the class, which is available This macro associates extra information to the class, which is available
using QObject::metaObject(). Qt makes only limited use of this feature, in using QObject::metaObject(). Qt makes only limited use of this feature, in
the \l{Active Qt}, \l{Qt D-Bus} and \l{Qt QML} modules. the \l{Active Qt}, \l{Qt D-Bus} and \l{Qt QML module}{Qt QML}.
The extra information takes the form of a \a Name string and a \a Value The extra information takes the form of a \a Name string and a \a Value
literal string. literal string.
@ -4122,7 +4122,7 @@ QDebug operator<<(QDebug dbg, const QObject *o) {
\sa QMetaObject::classInfo() \sa QMetaObject::classInfo()
\sa QAxFactory \sa QAxFactory
\sa {Using Qt D-Bus Adaptors} \sa {Using Qt D-Bus Adaptors}
\sa {Extending QML - Default Property Example} \sa {Extending QML}
*/ */
/*! /*!