diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-10 17:15:24 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-10 17:15:24 (GMT) |
| commit | 17e19884dd3da255af0467d095076769fc7f480b (patch) | |
| tree | e5ab38d700a02b6e25b521e24f08168b61021936 /doc/src/porting | |
| parent | 105329d83c609a4a13a21a2381e114d0418ce88e (diff) | |
| parent | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff) | |
| download | Qt-17e19884dd3da255af0467d095076769fc7f480b.zip Qt-17e19884dd3da255af0467d095076769fc7f480b.tar.gz Qt-17e19884dd3da255af0467d095076769fc7f480b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/porting')
| -rw-r--r-- | doc/src/porting/porting4-modifiedvirtual.qdocinc | 2 | ||||
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/porting/porting4-modifiedvirtual.qdocinc b/doc/src/porting/porting4-modifiedvirtual.qdocinc index 1164238..332543f 100644 --- a/doc/src/porting/porting4-modifiedvirtual.qdocinc +++ b/doc/src/porting/porting4-modifiedvirtual.qdocinc @@ -10,7 +10,7 @@ \row \o bool QMacMime::canConvert(const char *, int) \o bool QMacMime::canConvert(const QString &, int) \row \o QValueList<QByteArray> QMacMime::convertFromMime(QByteArray, const char *, int) \o QList<QByteArray> QMacMime::convertFromMime(QByteArray, const QString &, int) \row \o QByteArray QMacMime::convertToMime(QValueList<QByteArray> data, const char *, int) \o QByteArray QMacMime::convertToMime(QList<QByteArray> data, const QString &, int) -\row \o const char * QMacMime::convertorName() \o QString QMacMime::convertorName() +\row \o const char * QMacMime::convertorName( ) \o QString QMacMime::convertorName( ) \row \o int QMacMime::flavorFor(const char *) \o int QMacMime::flavorFor(const QString &) \row \o const char * QMacMime::mimeFor(int) \o QString QMacMime::mimeFor(int) \row \o QMetaObject * QObject::metaObject() const \o const QMetaObject * QObject::metaObject() const diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index 0e8cd86..a3960c3 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -3609,7 +3609,7 @@ \row \o \c PE_WindowFrame \o QStyle::PE_FrameWindow \row \o \c PE_CheckListController \o QStyle::PE_Q3CheckListController \row \o \c PE_CheckListIndicator \o QStyle::PE_Q3CheckListIndicator - \row \o \c PE_CheckListExclusiveIndicato\o QStyle::PE_Q3CheckListExclusiveIndicator + \row \o \c PE_CheckListExclusiveIndicator \o QStyle::PE_Q3CheckListExclusiveIndicator \row \o \c PE_PanelGroupBox \o QStyle::PE_FrameGroupBox \row \o \c PE_TreeBranch \o QStyle::PE_IndicatorBranch \row \o \c PE_RubberBand \o QStyle::CE_RubberBand \o uses QStyle::drawControl() |