diff options
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index d6191d1585..37144dcf17 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -383,7 +383,8 @@ \value AltModifier An Alt key on the keyboard is pressed. \value MetaModifier A Meta key on the keyboard is pressed. \value KeypadModifier A keypad button is pressed. - \value GroupSwitchModifier X11 only. A Mode_switch key on the keyboard is pressed. + \value GroupSwitchModifier X11 only (unless activated on Windows by a command line argument). + A Mode_switch key on the keyboard is pressed. \omitvalue KeyboardModifierMask @@ -1155,7 +1156,12 @@ the widget's author. \value WA_StyleSheet Indicates that the widget is styled using a - \l{Qt Style Sheets}{style sheet}. + \l{Qt Style Sheets}{style sheet}. WA_StyleSheet is set whenever a widget + is subject to a style sheet, even if the style sheet did not affect the + widget appearance. + + \value WA_StyleSheetTarget Indicates that the widget appearance was modified + by a \l{Qt Style Sheets}{style sheet}. WA_StyleSheet will also be set. \value WA_TabletTracking Indicates that the widget has tablet tracking enabled. See QWidget::tabletTracking. @@ -3232,37 +3238,3 @@ \value ChecksumItuV41 Checksum calculation based on ITU-V.41. */ - -/*! - \fn bool Qt::mightBeRichText(const QString& text) - - Returns \c true if the string \a text is likely to be rich text; - otherwise returns \c false. - - This function uses a fast and therefore simple heuristic. It - mainly checks whether there is something that looks like a tag - before the first line break. Although the result may be correct - for common cases, there is no guarantee. - - This function is defined in the \c <QTextDocument> header file. -*/ - -/*! - \fn QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode) - - Converts the plain text string \a plain to an HTML-formatted - paragraph while preserving most of its look. - - \a mode defines how whitespace is handled. - - This function is defined in the \c <QTextDocument> header file. - - \sa escape(), mightBeRichText() -*/ - -/*! - \fn QTextCodec *Qt::codecForHtml(const QByteArray &ba) - \internal - - This function is defined in the \c <QTextDocument> header file. -*/ |