diff options
| author | Teemu Katajisto <teemu.katajisto@digia.com> | 2012-02-08 13:42:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 12:51:57 +0100 |
| commit | 7aca5aa910f610239c7d33696003d100e558d45a (patch) | |
| tree | 84504e6c765a141717d002fdaee87a3840d2765a /src/corelib/kernel | |
| parent | 651016020f9ac996f2aac50e2d30505bdffe2331 (diff) | |
Various documentation fixes ported from 4.8
Selected documentation fixes for qtbase from 4.8 commit
40fb4750910e23d3e7128ca8e0f1c5920b05bd5a
Task-number: QTBUG-8625
Task-number: QTBUG-19808
Task-number: QTBUG-1231
Task-number: QTBUG-21073
Task-number: QTBUG-8939
Task-number: QTBUG-20399
Task-number: QTBUG-20944
Task-number: QTBUG-22095
Task-number: QTBUG-11278
Task-number: QTBUG-15653
Change-Id: Ia4f59fce7c85f04b6da953a3988f705d9d9a658a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 25 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 31a46ad744..0348faf1f2 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -135,8 +135,8 @@ void QAbstractEventDispatcherPrivate::releaseTimerId(int timerId) QAbstractEventDispatcher also allows the integration of an external event loop with the Qt event loop. For example, the - \l{Qt Solutions}{Motif Extension Qt Solution} includes a - reimplementation of QAbstractEventDispatcher that merges Qt and + \l{Motif Extension} + includes a reimplementation of QAbstractEventDispatcher that merges Qt and Motif events together. \sa QEventLoop, QCoreApplication, QThread diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 7975fc2628..5ffa2d81dd 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1353,7 +1353,30 @@ const char *QMetaMethod::typeName() const Returns the tag associated with this method. Tags are special macros recognized by \c moc that make it - possible to add extra information about a method. For the moment, + possible to add extra information about a method. + + Tag information can be added in the following + way in the function declaration: + + \code + #define THISISTESTTAG // tag text + ... + private slots: + THISISTESTTAG void testFunc(); + \endcode + + and the information can be accessed by using: + + \code + MainWindow win; + win.show(); + + int functionIndex = win.metaObject()->indexOfSlot("testFunc()"); + QMetaMethod mm = metaObject()->method(functionIndex); + qDebug() << mm.tag(); // prints THISISTESTTAG + \endcode + + For the moment, \c moc doesn't support any special tags. */ const char *QMetaMethod::tag() const diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 4377355486..252a713872 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2247,7 +2247,7 @@ static inline void check_and_warn_compat(const QMetaObject *sender, const QMetaM call qRegisterMetaType() to register the data type before you establish the connection. - \sa disconnect(), sender(), qRegisterMetaType() + \sa disconnect(), sender(), qRegisterMetaType(), Q_DECLARE_METATYPE() */ QMetaObject::Connection QObject::connect(const QObject *sender, const char *signal, const QObject *receiver, const char *method, |