diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /src/corelib/global | |
parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index e5c708e29a..be569bcffe 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -500,7 +500,7 @@ the underlines. \value TextDontPrint Treat this text as "hidden" and don't print it. \value TextIncludeTrailingSpaces When this option is set, - QTextLine::naturalTextWidth() and naturalTextRect() will + QTextLine::naturalTextWidth() and QTextLine::naturalTextRect() will return a value that includes the width of trailing spaces in the text; otherwise this width is excluded. \value TextJustificationForced Ensures that text lines are justified. @@ -1892,7 +1892,7 @@ menu, and in contrast to \c NoContextMenu, the handling is \e not deferred to the widget's parent. This means that all right mouse button events are guaranteed to be delivered to the widget itself - through mousePressEvent(), and mouseReleaseEvent(). + through QWidget::mousePressEvent(), and QWidget::mouseReleaseEvent(). \value DefaultContextMenu the widget's QWidget::contextMenuEvent() handler is called. \value ActionsContextMenu the widget displays its QWidget::actions() as context menu. \value CustomContextMenu the widget emits the QWidget::customContextMenuRequested() signal. @@ -2248,9 +2248,9 @@ \enum Qt::TextFormat This enum is used in widgets that can display both plain text and - rich text, e.g. QLabel. It is used for deciding whether a text + rich text, for example QLabel. It is used for deciding whether a text string should be interpreted as one or the other. This is normally - done by passing one of the enum values to a setTextFormat() + done by passing one of the enum values to a QTextEdit::setTextFormat() function. \value PlainText The text string is interpreted as a plain text @@ -2450,7 +2450,7 @@ \value ImSurroundingText The plain text around the input area, for example the current paragraph. \value ImCurrentSelection The currently selected text. \value ImMaximumTextLength The maximum number of characters that the widget can hold. If there is no limit, - QVariant() is returned. + QVariant::QVariant() is returned. \value ImAnchorPosition The position of the selection anchor. This may be less or greater than \c ImCursorPosition, depending on which side of selection the cursor is. If there is no selection, it returns the same as \c ImCursorPosition. |