diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
tree | 8336143e8c09810dc97324970fed61af27e26a97 /src/corelib/kernel/qmetaobject.cpp | |
parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index e446d8b6ba..a8c21657cb 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -86,16 +86,16 @@ QT_BEGIN_NAMESPACE The functions you are most likely to find useful are these: \list - \o className() returns the name of a class. - \o superClass() returns the superclass's meta-object. - \o method() and methodCount() provide information + \li className() returns the name of a class. + \li superClass() returns the superclass's meta-object. + \li method() and methodCount() provide information about a class's meta-methods (signals, slots and other \l{Q_INVOKABLE}{invokable} member functions). - \o enumerator() and enumeratorCount() and provide information about + \li enumerator() and enumeratorCount() and provide information about a class's enumerators. - \o propertyCount() and property() provide information about a + \li propertyCount() and property() provide information about a class's properties. - \o constructor() and constructorCount() provide information + \li constructor() and constructorCount() provide information about a class's meta-constructors. \endlist @@ -393,7 +393,7 @@ const QObject *QMetaObject::cast(const QObject *obj) const */ QString QMetaObject::tr(const char *s, const char *c, int n) const { - return QCoreApplication::translate(rawStringData(this, 0), s, c, QCoreApplication::CodecForTr, n); + return QCoreApplication::translate(rawStringData(this, 0), s, c, QCoreApplication::DefaultCodec, n); } /*! @@ -1414,18 +1414,18 @@ enum { MaximumParamCount = 11 }; // up to 10 arguments + 1 return value depending on \a type: \list - \o If \a type is Qt::DirectConnection, the member will be invoked immediately. + \li If \a type is Qt::DirectConnection, the member will be invoked immediately. - \o If \a type is Qt::QueuedConnection, + \li If \a type is Qt::QueuedConnection, a QEvent will be sent and the member is invoked as soon as the application enters the main event loop. - \o If \a type is Qt::BlockingQueuedConnection, the method will be invoked in + \li If \a type is Qt::BlockingQueuedConnection, the method will be invoked in the same way as for Qt::QueuedConnection, except that the current thread will block until the event is delivered. Using this connection type to communicate between objects in the same thread will lead to deadlocks. - \o If \a type is Qt::AutoConnection, the member is invoked + \li If \a type is Qt::AutoConnection, the member is invoked synchronously if \a obj lives in the same thread as the caller; otherwise it will invoke the member asynchronously. \endlist @@ -2034,13 +2034,13 @@ QMetaMethod::MethodType QMetaMethod::methodType() const \a connectionType: \list - \o If \a connectionType is Qt::DirectConnection, the member will be invoked immediately. + \li If \a connectionType is Qt::DirectConnection, the member will be invoked immediately. - \o If \a connectionType is Qt::QueuedConnection, + \li If \a connectionType is Qt::QueuedConnection, a QEvent will be posted and the member is invoked as soon as the application enters the main event loop. - \o If \a connectionType is Qt::AutoConnection, the member is invoked + \li If \a connectionType is Qt::AutoConnection, the member is invoked synchronously if \a object lives in the same thread as the caller; otherwise it will invoke the member asynchronously. \endlist |