diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-12-13 12:20:30 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:07 (GMT) |
| commit | 08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f (patch) | |
| tree | c775ae5728609a44a2ea2b579a2fb891189f7c4e /src/corelib/kernel | |
| parent | b10d3383b8dcfafae5adad2f373cc986cc3e66cf (diff) | |
| download | Qt-08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f.zip Qt-08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f.tar.gz Qt-08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f.tar.bz2 | |
Various qt documentation fixes (wk 43)
Fixes for bugs: QTBUG-21073, QTBUG-8625, QTBUG-1231, QTBUG-19808,
QTBUG-8939, QTBUG-20399, QTBUG-20944, QTBUG-12096, QTBUG-12389,
QTBUG-6151, QTBUG-16667, QTBUG-7542, QTBUG-22095, QTBUG-11278 and
QTBUG-15653
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 25 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index e0ee10e..67e2502 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -230,7 +230,7 @@ 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 + \l{ftp://ftp.qt.nokia.com/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz}{Motif Extension} includes a reimplementation of QAbstractEventDispatcher that merges Qt and Motif events together. diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 71f375f..8e6f14e 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1337,7 +1337,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 57449bd..9261fef 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2453,7 +2453,7 @@ int QObject::receivers(const char *signal) const call qRegisterMetaType() to register the data type before you establish the connection. - \sa disconnect(), sender(), qRegisterMetaType() + \sa disconnect(), sender(), qRegisterMetaType(), Q_DECLARE_METATYPE() */ bool QObject::connect(const QObject *sender, const char *signal, |