diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/widgets | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/doc/src/qtwidgets.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/doc/src/qtwidgets.qdoc b/src/widgets/doc/src/qtwidgets.qdoc index fd0e7995b7..2e3403e9d9 100644 --- a/src/widgets/doc/src/qtwidgets.qdoc +++ b/src/widgets/doc/src/qtwidgets.qdoc @@ -30,7 +30,7 @@ \title Qt Widgets C++ Classes \ingroup modules - \brief The QtWidgets module extends Qt Gui with C++ widget functionality. + \brief The Qt Widgets module extends Qt GUI with C++ widget functionality. To include the definitions of the module's classes, use the following directive: diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 26274f1c7b..9c4901795d 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -90,7 +90,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C Qt provides a set of QStyle subclasses that emulate the native look of the different platforms supported by Qt (QWindowsStyle, QMacStyle, etc.). These styles are built into the - QtGui library, other styles can be made available using Qt's + Qt GUI module, other styles can be made available using Qt's plugin mechansim. Most functions for drawing style elements take four arguments: @@ -153,7 +153,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C Qt contains a set of QStyle subclasses that emulate the styles of the different platforms supported by Qt (QWindowsStyle, QMacStyle etc.). By default, these styles are built - into the QtGui library. Styles can also be made available as + into the Qt GUI module. Styles can also be made available as plugins. Qt's built-in widgets use QStyle to perform nearly all of their diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index c60c9a3f57..b8f7e7e1d4 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -381,7 +381,7 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect) efficient way to add reasonable online help facilities to applications, and to provide a basis for rich text editors. If you find the HTML support insufficient for your needs you may consider - the use of QtWebKit, which provides a full-featured web browser + the use of Qt WebKit, which provides a full-featured web browser widget. The shape of the mouse cursor on a QTextEdit is Qt::IBeamCursor by default. |