diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
| commit | a24d87f6469fa491624590383617b43c2b3dda32 (patch) | |
| tree | ee6a76cecf35e3f20951f5b13785aaaef12bbade /src/gui/styles | |
| parent | da19e7f6b6b822f7a473c4eb2dff001a3434353a (diff) | |
| parent | 2f8e66b326c3d6748d530ab5abbf4fe5a91a6a3f (diff) | |
| download | Qt-a24d87f6469fa491624590383617b43c2b3dda32.zip Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.gz Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstyleoption.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index 4236209..c057a2b 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -2826,8 +2826,9 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type) /*! \variable QStyleOptionComplex::subControls - \brief a bitwise OR of the various sub-controls that need to be - drawn for the complex control + + This variable holds a bitwise OR of the \l{QStyle::SubControl} + {sub-controls} to be drawn for the complex control. The default value is QStyle::SC_All. @@ -2836,8 +2837,9 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type) /*! \variable QStyleOptionComplex::activeSubControls - \brief a bitwise OR of the various sub-controls that are active - (pressed) for the complex control + + This variable holds a bitwise OR of the \l{QStyle::SubControl} + {sub-controls} that are active for the complex control. The default value is QStyle::SC_None. |