diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
| commit | 9d174f13e48730ac06aa429e0f011a02b333025e (patch) | |
| tree | 6075fa3c24880dd6fc548f03395a5809739f67de /doc/src/widgets-and-layouts | |
| parent | 4790ab735f96a13027e7292ff5b49195224f0af9 (diff) | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | Qt-9d174f13e48730ac06aa429e0f011a02b333025e.zip Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.gz Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'doc/src/widgets-and-layouts')
| -rw-r--r-- | doc/src/widgets-and-layouts/styles.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/widgets-and-layouts/stylesheet.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc index b7f7322..9a28715 100644 --- a/doc/src/widgets-and-layouts/styles.qdoc +++ b/doc/src/widgets-and-layouts/styles.qdoc @@ -125,7 +125,7 @@ necessary for drawing. Thanks to QStyleOption, it is possible to make QStyle draw widgets without linking in any code for the widget. This makes it possible to use \l{QStyle}'s draw functions on any paint - device. Ie you can draw a combobox on any widget, not just on a + device, i.e., you can draw a combobox on any widget, not just on a QComboBox. The widget is passed as the last argument in case the style needs diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index ebe67df..5f42f28 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -3822,7 +3822,7 @@ The tear indicator and the scroll buttons can be further customized as follows: \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148 - Sine Qt 4.6 the close button can be customized as follow: + Since Qt 4.6 the close button can be customized as follow: \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 159 \section2 Customizing QTableView |