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/widgets/widgets/qtextbrowser.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/widgets/widgets/qtextbrowser.cpp')
| -rw-r--r-- | src/widgets/widgets/qtextbrowser.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index d9229c12e8..050730ec2a 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -902,10 +902,10 @@ void QTextBrowser::home() /*! The event \a ev is used to provide the following keyboard shortcuts: \table - \header \i Keypress \i Action - \row \i Alt+Left Arrow \i \l backward() - \row \i Alt+Right Arrow \i \l forward() - \row \i Alt+Up Arrow \i \l home() + \header \li Keypress \li Action + \row \li Alt+Left Arrow \li \l backward() + \row \li Alt+Right Arrow \li \l forward() + \row \li Alt+Up Arrow \li \l home() \endtable */ void QTextBrowser::keyPressEvent(QKeyEvent *ev) @@ -1068,10 +1068,10 @@ void QTextBrowser::paintEvent(QPaintEvent *e) depending on the resource type: \table - \header \i ResourceType \i QVariant::Type - \row \i QTextDocument::HtmlResource \i QString or QByteArray - \row \i QTextDocument::ImageResource \i QImage, QPixmap or QByteArray - \row \i QTextDocument::StyleSheetResource \i QString or QByteArray + \header \li ResourceType \li QVariant::Type + \row \li QTextDocument::HtmlResource \li QString or QByteArray + \row \li QTextDocument::ImageResource \li QImage, QPixmap or QByteArray + \row \li QTextDocument::StyleSheetResource \li QString or QByteArray \endtable */ QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name) @@ -1146,10 +1146,10 @@ void QTextBrowser::clearHistory() Returns the url of the HistoryItem. \table - \header \i Input \i Return - \row \i \a{i} < 0 \i \l backward() history - \row \i\a{i} == 0 \i current, see QTextBrowser::source() - \row \i \a{i} > 0 \i \l forward() history + \header \li Input \li Return + \row \li \a{i} < 0 \li \l backward() history + \row \li\a{i} == 0 \li current, see QTextBrowser::source() + \row \li \a{i} > 0 \li \l forward() history \endtable \since 4.4 @@ -1164,10 +1164,10 @@ QUrl QTextBrowser::historyUrl(int i) const Returns the documentTitle() of the HistoryItem. \table - \header \i Input \i Return - \row \i \a{i} < 0 \i \l backward() history - \row \i \a{i} == 0 \i current, see QTextBrowser::source() - \row \i \a{i} > 0 \i \l forward() history + \header \li Input \li Return + \row \li \a{i} < 0 \li \l backward() history + \row \li \a{i} == 0 \li current, see QTextBrowser::source() + \row \li \a{i} > 0 \li \l forward() history \endtable \snippet doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp 0 |