diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 20:18:14 +0100 |
commit | 4159ee840549df11287294f0928e90f35f3e06ff (patch) | |
tree | 4a3947e37d54bdb78b4042e9ced20dbf181b5a2c /src/widgets/doc/src/widgets-and-layouts | |
parent | 59dbf1786f22ec4ac88d8f9d38cac5cfb82acaea (diff) | |
parent | c8c39ecc37c156ac2677de09a26548dfc274b564 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
config.tests/unix/ptrsize.test
configure
src/corelib/global/qnamespace.h
src/network/socket/qabstractsocket.cpp
tests/auto/other/networkselftest/networkselftest.pro
Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
Diffstat (limited to 'src/widgets/doc/src/widgets-and-layouts')
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/styles.qdoc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc index 74a5ce3189..a42ee0db61 100644 --- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc @@ -989,9 +989,7 @@ The style option for tabs (QStyleOptionTab) contains the necessary information for drawing tabs. The option contains the position of the tab in the tab bar, the position of the selected tab, the - shape of the tab, the text, and the icon. After Qt 4.1, the option - should be cast to a QStyleOptionTabV2, which also contains the - icon's size. + shape of the tab, the text, the icon, and the icon's size. As the Java style tabs don't overlap, we also present an image of a tab widget in the common style. Note that if you want the tabs @@ -1024,7 +1022,7 @@ Note that individual tabs may be disabled even if the tab bar is not. The tab will be active if the tab bar is active. - Here follows a table of QStyleOptionTabV2's members: + Here follows a table of QStyleOptionTab's members: \table 90% \header @@ -1450,7 +1448,7 @@ \li Content \row \li features - \li Flags of the QStyleOptionFrameV2::FrameFeatures + \li Flags of the QStyleOptionFrame::FrameFeatures enum describing the frame of the group box. \row \li lineWidth @@ -1501,7 +1499,7 @@ \image javastyle/progressbarimage.png - The style option for QProgressBar is QStyleOptionProgressBarV2. + The style option for QProgressBar is QStyleOptionProgressBar. The bar does not set any state flags, but the other members of the option are: |